Mediatek MT8183 clock and scpsys support
Subsystems (4)
v4 cover Mediatek MT8183 clock and scpsys support
This series is based on v5.0-rc1 and most of changes are extracted from series below (clock/scpsys common changes for both MT8183 & MT6765)
https://patchwork.kernel.org/patch/10528495/
(clock support of MT8183)
https://patchwork.kernel.org/patch/10549891/
The whole series is composed of
clock common changes for both MT8183 & MT6765 (PATCH 1-3), scpsys common changes for both MT8183 & MT6765 (PATCH 4), clock support of MT8183 (PATCH 5-8),
scpsys support of MT8183 (PATCH 9-11) and
resend a clock patch long time ago(PTACH 12).
change sinve v3:
- add fix tag.
- small change of mtk_clk_mux data structure.
- use of_property_for_each_string to iterate dependent subsys clock of power domain.
- document critical clocks.
- reduce some clock register error log.
- few coding style fix.
change sinve v2:
- refine for implementation consistency of mtk clk mux.
- separate the onoff API into enable/disable API for mtk scpsys.
- resend a patch about PLL rate changing.
changes since v1:
- refine for better code quality.
- some minor bug fix of clock part, like incorrect control address and missing clocks.
v4 cover Mediatek MT8183 clock and scpsys support
This series is based on v5.0-rc1 and most of changes are extracted from series below (clock/scpsys common changes for both MT8183 & MT6765)
https://patchwork.kernel.org/patch/10528495/
(clock support of MT8183)
https://patchwork.kernel.org/patch/10549891/
The whole series is composed of
clock common changes for both MT8183 & MT6765 (PATCH 1-3), scpsys common changes for both MT8183 & MT6765 (PATCH 4), clock support of MT8183 (PATCH 5-8),
scpsys support of MT8183 (PATCH 9-11) and
resend a clock patch long time ago(PTACH 12).
change sinve v3:
- add fix tag.
- small change of mtk_clk_mux data structure.
- use of_property_for_each_string to iterate dependent subsys clock of power domain.
- document critical clocks.
- reduce some clock register error log.
- few coding style fix.
change sinve v2:
- refine for implementation consistency of mtk clk mux.
- separate the onoff API into enable/disable API for mtk scpsys.
- resend a patch about PLL rate changing.
changes since v1:
- refine for better code quality.
- some minor bug fix of clock part, like incorrect control address and missing clocks.
James Liao (1):
clk: mediatek: Allow changing PLL rate when it is off
Owen Chen (4):
clk: mediatek: Disable tuner_en before change PLL rate
clk: mediatek: add new clkmux register API
clk: mediatek: add configurable pcwibits and fmin to mtk_pll_data
soc: mediatek: add new flow for mtcmos power.
Weiyi Lu (7):
dt-bindings: ARM: Mediatek: Document bindings for MT8183
clk: mediatek: Add dt-bindings for MT8183 clocks
clk: mediatek: Add flags support for mtk_gate data
clk: mediatek: Add MT8183 clock support
dt-bindings: soc: fix typo of MT8173 power dt-bindings
dt-bindings: soc: Add MT8183 power dt-bindings
soc: mediatek: Add MT8183 scpsys support
.../arm/mediatek/mediatek,apmixedsys.txt | 1 + .../bindings/arm/mediatek/mediatek,audsys.txt | 1 + .../bindings/arm/mediatek/mediatek,camsys.txt | 22 + .../bindings/arm/mediatek/mediatek,imgsys.txt | 1 + .../arm/mediatek/mediatek,infracfg.txt | 1 + .../bindings/arm/mediatek/mediatek,ipu.txt | 43 + .../bindings/arm/mediatek/mediatek,mcucfg.txt | 1 + .../bindings/arm/mediatek/mediatek,mfgcfg.txt | 1 + .../bindings/arm/mediatek/mediatek,mmsys.txt | 1 + .../arm/mediatek/mediatek,topckgen.txt | 1 + .../arm/mediatek/mediatek,vdecsys.txt | 1 + .../arm/mediatek/mediatek,vencsys.txt | 1 + .../bindings/soc/mediatek/scpsys.txt | 14 + drivers/clk/mediatek/Kconfig | 75 + drivers/clk/mediatek/Makefile | 15 +- drivers/clk/mediatek/clk-gate.c | 5 +- drivers/clk/mediatek/clk-gate.h | 17 +- drivers/clk/mediatek/clk-mt8183-audio.c | 105 ++ drivers/clk/mediatek/clk-mt8183-cam.c | 63 + drivers/clk/mediatek/clk-mt8183-img.c | 63 + drivers/clk/mediatek/clk-mt8183-ipu0.c | 56 + drivers/clk/mediatek/clk-mt8183-ipu1.c | 56 + drivers/clk/mediatek/clk-mt8183-ipu_adl.c | 54 + drivers/clk/mediatek/clk-mt8183-ipu_conn.c | 123 ++ drivers/clk/mediatek/clk-mt8183-mfgcfg.c | 54 + drivers/clk/mediatek/clk-mt8183-mm.c | 111 ++ drivers/clk/mediatek/clk-mt8183-vdec.c | 67 + drivers/clk/mediatek/clk-mt8183-venc.c | 59 + drivers/clk/mediatek/clk-mt8183.c | 1285 +++++++++++++++++ drivers/clk/mediatek/clk-mtk.c | 3 +- drivers/clk/mediatek/clk-mtk.h | 3 + drivers/clk/mediatek/clk-mux.c | 223 +++ drivers/clk/mediatek/clk-mux.h | 89 ++ drivers/clk/mediatek/clk-pll.c | 53 +- drivers/soc/mediatek/Makefile | 2 +- drivers/soc/mediatek/mtk-scpsys-ext.c | 99 ++ drivers/soc/mediatek/mtk-scpsys.c | 602 ++++++-- include/dt-bindings/clock/mt8183-clk.h | 422 ++++++ include/dt-bindings/power/mt8173-power.h | 6 +- include/dt-bindings/power/mt8183-power.h | 26 + include/linux/soc/mediatek/scpsys-ext.h | 39 + 41 files changed, 3757 insertions(+), 107 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,camsys.txt create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,ipu.txt create mode 100644 drivers/clk/mediatek/clk-mt8183-audio.c create mode 100644 drivers/clk/mediatek/clk-mt8183-cam.c create mode 100644 drivers/clk/mediatek/clk-mt8183-img.c create mode 100644 drivers/clk/mediatek/clk-mt8183-ipu0.c create mode 100644 drivers/clk/mediatek/clk-mt8183-ipu1.c create mode 100644 drivers/clk/mediatek/clk-mt8183-ipu_adl.c create mode 100644 drivers/clk/mediatek/clk-mt8183-ipu_conn.c create mode 100644 drivers/clk/mediatek/clk-mt8183-mfgcfg.c create mode 100644 drivers/clk/mediatek/clk-mt8183-mm.c create mode 100644 drivers/clk/mediatek/clk-mt8183-vdec.c create mode 100644 drivers/clk/mediatek/clk-mt8183-venc.c create mode 100644 drivers/clk/mediatek/clk-mt8183.c create mode 100644 drivers/clk/mediatek/clk-mux.c create mode 100644 drivers/clk/mediatek/clk-mux.h create mode 100644 drivers/soc/mediatek/mtk-scpsys-ext.c create mode 100644 include/dt-bindings/clock/mt8183-clk.h create mode 100644 include/dt-bindings/power/mt8183-power.h create mode 100644 include/linux/soc/mediatek/scpsys-ext.h
Signature · 1 line
2.18.0
Stephen Boyd
maintainerQuoting Weiyi Lu (2019-02-01 00:30:04)
Quoted 6 lines
This series is based on v5.0-rc1 and most of changes are extracted from series below (clock/scpsys common changes for both MT8183 & MT6765)
https://patchwork.kernel.org/patch/10528495/
(clock support of MT8183)
https://patchwork.kernel.org/patch/10549891/
Quoted 6 lines
The whole series is composed of
clock common changes for both MT8183 & MT6765 (PATCH 1-3), scpsys common changes for both MT8183 & MT6765 (PATCH 4), clock support of MT8183 (PATCH 5-8),
scpsys support of MT8183 (PATCH 9-11) and
resend a clock patch long time ago(PTACH 12).
What's the merge plan here? Do you want me to apply these patches to clk tree? Will someone be sending me a pull request for mediatek clk changes this cycle? It's getting pretty late for much of anything making this upcoming merge window.
Matthias Brugger
maintainerQuoted 14 lines · Stephen Boyd
Quoting Weiyi Lu (2019-02-01 00:30:04)
Quoted 6 lines
This series is based on v5.0-rc1 and most of changes are extracted from series below (clock/scpsys common changes for both MT8183 & MT6765)
https://patchwork.kernel.org/patch/10528495/
(clock support of MT8183)
https://patchwork.kernel.org/patch/10549891/Quoted 6 lines
The whole series is composed of
clock common changes for both MT8183 & MT6765 (PATCH 1-3), scpsys common changes for both MT8183 & MT6765 (PATCH 4), clock support of MT8183 (PATCH 5-8),
scpsys support of MT8183 (PATCH 9-11) and
resend a clock patch long time ago(PTACH 12).
Quoted 5 lines
What's the merge plan here? Do you want me to apply these patches to clk tree? Will someone be sending me a pull request for mediatek clk changes this cycle? It's getting pretty late for much of anything making this upcoming merge window.
As far as I can see, the clock patches are independent, so I think it is OK to take them. SCPSYS patches will go through my tree once they are in shape.
Do you prefer to get pull requests for clock patches? I wasn't aware of that. But if you prefer that, we can find someone who prepares every merge window a pull request.
Regards,
Matthias
Stephen Boyd
maintainerQuoting Matthias Brugger (2019-02-21 00:36:24)
Quoted 12 lines · Stephen Boyd
Quoted 6 lines
What's the merge plan here? Do you want me to apply these patches to clk tree? Will someone be sending me a pull request for mediatek clk changes this cycle? It's getting pretty late for much of anything making this upcoming merge window.
As far as I can see, the clock patches are independent, so I think it is OK to take them. SCPSYS patches will go through my tree once they are in shape.
Ok great. When patches for clks are interspersed throughout the patch series it makes me think that something later in the series depends on something that isn't a clk patch so then I can't apply it.
Quoted 5 lines
Do you prefer to get pull requests for clock patches? I wasn't aware of that. But if you prefer that, we can find someone who prepares every merge window a pull request.
I don't really care one way or the other about pull requests vs. manually applying patches. It helps if someone wants to pick the patches up and send them along when there are complex dependencies between the clk patches and dts bits or something like that. It also helps if there's someone else with knowledge of the particular SoC saying "these are good, please pull these patches". Subsystem maintainers obviously aren't experts in all SoCs and their various quirks, plus datasheets aren't always so widely available, so sharing the load with SoC maintainers who are familiar with the hardware usually makes a lot of sense.
Otherwise, if you just want to put your "Reviewed-by" tag on any patches that look good and are sane then I'll quickly understand that these patches are good and that I should pick them up into the clk tree from the list. Just please communicate one way or the other about patches that you care about because it helps to know if they've gotten attention or not.
Quoted 11 lines · Stephen Boyd
Quoting Matthias Brugger (2019-02-21 00:36:24)
Quoted 10 lines · Stephen Boyd
Quoted 6 lines
What's the merge plan here? Do you want me to apply these patches to clk tree? Will someone be sending me a pull request for mediatek clk changes this cycle? It's getting pretty late for much of anything making this upcoming merge window.
Quoted 7 lines
Quoted 2 lines
As far as I can see, the clock patches are independent, so I think it is OK to take them. SCPSYS patches will go through my tree once they are in shape.
Ok great. When patches for clks are interspersed throughout the patch series it makes me think that something later in the series depends on something that isn't a clk patch so then I can't apply it.
Hi Stephen,
Sorry for making such complex dependencies between the clk patches and others in this series. And just like Matthias mentioned, the clock patches are independent from others. I could resend a clock-only series right away if each clock patch in v4 is qualified to merge into clk-next.
If there still some provide need to be fixed, please let me know. I'll fix them and send v5 only for clock.
Quoted 24 lines
Quoted 5 lines
Do you prefer to get pull requests for clock patches? I wasn't aware of that. But if you prefer that, we can find someone who prepares every merge window a pull request.
I don't really care one way or the other about pull requests vs. manually applying patches. It helps if someone wants to pick the patches up and send them along when there are complex dependencies between the clk patches and dts bits or something like that. It also helps if there's someone else with knowledge of the particular SoC saying "these are good, please pull these patches". Subsystem maintainers obviously aren't experts in all SoCs and their various quirks, plus datasheets aren't always so widely available, so sharing the load with SoC maintainers who are familiar with the hardware usually makes a lot of sense.
Otherwise, if you just want to put your "Reviewed-by" tag on any patches that look good and are sane then I'll quickly understand that these patches are good and that I should pick them up into the clk tree from the list. Just please communicate one way or the other about patches that you care about because it helps to know if they've gotten attention or not.
Stephen Boyd
maintainerQuoting Weiyi Lu (2019-02-25 20:00:50)
Quoted 22 lines · Stephen Boyd
Quoted 11 lines
Quoting Matthias Brugger (2019-02-21 00:36:24)
Quoted 10 lines · Stephen Boyd
Quoted 6 lines
What's the merge plan here? Do you want me to apply these patches to clk tree? Will someone be sending me a pull request for mediatek clk changes this cycle? It's getting pretty late for much of anything making this upcoming merge window.
Quoted 7 lines
Quoted 2 lines
As far as I can see, the clock patches are independent, so I think it is OK to take them. SCPSYS patches will go through my tree once they are in shape.
Ok great. When patches for clks are interspersed throughout the patch series it makes me think that something later in the series depends on something that isn't a clk patch so then I can't apply it.
Hi Stephen,
Quoted 7 lines
Sorry for making such complex dependencies between the clk patches and others in this series. And just like Matthias mentioned, the clock patches are independent from others. I could resend a clock-only series right away if each clock patch in v4 is qualified to merge into clk-next.
If there still some provide need to be fixed, please let me know. I'll fix them and send v5 only for clock.
It looks like Matthias has some comments on the first patch that need to be addressed. I looked over the rest of the clk patches and they look ok at a quick glance. If you resend just the clk patches without the rest then I can probably apply them for the upcoming merge window.
PATCH v4 1/12 clk: mediatek: Disable tuner_en before change PLL rate
In reply to Weiyi LuFrom: Owen Chen <[email protected]>
PLLs with tuner_en bit, such as APLL1, need to disable tuner_en before apply new frequency settings, or the new frequency settings (pcw) will not be applied.
The tuner_en bit will be disabled during changing PLL rate and be restored after new settings applied.
Another minor change is to correct the macro name of pcw change bit to CON1_PCW_CHG because PCW_CHG(BIT31) is on CON1.
--- drivers/clk/mediatek/clk-pll.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)
drivers/clk/mediatek/clk-pll.c +31 -2
@@ -27,7 +27,7 @@#define CON0_BASE_EN BIT(0)#define CON0_PWR_ON BIT(0)#define CON0_ISO_EN BIT(1) -#define CON0_PCW_CHG BIT(31) +#define CON1_PCW_CHG BIT(31)#define AUDPLL_TUNER_EN BIT(31)
@@ -93,9 +93,31 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, {u32 con1, val;int pll_en; +u32 tuner_en =0 ; +u32 tuner_en_mask; +void __iomem *tuner_en_addr =NULL ; pll_en =readl (pll->base_addr +REG_CON0 ) &CON0_BASE_EN ; +/* disable tuner */ +if (pll->tuner_en_addr) { + tuner_en_addr = pll->tuner_en_addr; + tuner_en_mask =BIT (pll->data->tuner_en_bit); + }else if (pll->tuner_addr) { + tuner_en_addr = pll->tuner_addr; + tuner_en_mask =AUDPLL_TUNER_EN ; + } + +if (tuner_en_addr) { + val =readl (tuner_en_addr); + tuner_en = val & tuner_en_mask; + +if (tuner_en) { + val &= ~tuner_en_mask; +writel (val, tuner_en_addr); + } + } +/* set postdiv */ val =readl (pll->pd_addr); val &= ~(POSTDIV_MASK << pll->data->pd_shift);
@@ -116,12 +138,19 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, con1 =readl (pll->base_addr +REG_CON1 );if (pll_en) - con1 |=CON0_PCW_CHG ; + con1 |=CON1_PCW_CHG ;writel (con1, pll->base_addr +REG_CON1 );if (pll->tuner_addr)writel (con1 +1 , pll->tuner_addr); +/* restore tuner_en */ +if (tuner_en_addr && tuner_en) { + val =readl (tuner_en_addr); + val |= tuner_en_mask; +writel (val, tuner_en_addr); + } +if (pll_en)udelay (20 ); }
Signature · 1 line
2.18.0
Matthias Brugger
maintainerRe: [PATCH v4 01/12] clk: mediatek: Disable tuner_en before change PLL rate
Quoted 49 lines · Weiyi Lu
From: Owen Chen <[email protected]>
PLLs with
tuner_enbit, such as APLL1, need to disabletuner_enbefore apply new frequency settings, or the new frequency settings (pcw) will not be applied.
Thetuner_enbit will be disabled during changing PLL rate and be restored after new settings applied.
Another minor change is to correct the macro name of pcw change bit toCON1_PCW_CHGbecausePCW_CHG(BIT31)is on CON1.Fixes e2f744a82d725 (clk: mediatek: Add MT2712 clock support)Cc <[email protected]>Signed-off-by Owen Chen <[email protected]>--- drivers/clk/mediatek/clk-pll.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)drivers/clk/mediatek/clk-pll.c +13
-1@@ -27,7 +27,7 @@#define CON0_BASE_EN BIT(0)#define CON0_PWR_ON BIT(0)#define CON0_ISO_EN BIT(1) -#define CON0_PCW_CHG BIT(31) +#define CON1_PCW_CHG BIT(31)#define AUDPLL_TUNER_EN BIT(31)@@ -93,9 +93,31 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, {u32 con1, val;int pll_en; +u32 tuner_en =0 ; +u32 tuner_en_mask; +void __iomem *tuner_en_addr =NULL ; pll_en =readl (pll->base_addr +REG_CON0 ) &CON0_BASE_EN ; +/* disable tuner */ +if (pll->tuner_en_addr) { + tuner_en_addr = pll->tuner_en_addr; + tuner_en_mask =BIT (pll->data->tuner_en_bit); + }else if (pll->tuner_addr) { + tuner_en_addr = pll->tuner_addr; + tuner_en_mask =AUDPLL_TUNER_EN ; + } +
drivers/clk/mediatek/clk-pll.c static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, · line 120
Quoted 10 lines
drivers/clk/mediatek/clk-pll.c +10
-0+if (tuner_en_addr) { + val =readl (tuner_en_addr); + tuner_en = val & tuner_en_mask; + +if (tuner_en) { + val &= ~tuner_en_mask; +writel (val, tuner_en_addr); + } + } +
Why don't we use a flag here, it would make the code easier to understand. I think it would also help if you put this code in a separate function.
Regards,
Matthias
Quoted 25 lines
drivers/clk/mediatek/clk-pll.c +8
-1/* set postdiv */ val =readl (pll->pd_addr); val &= ~(POSTDIV_MASK << pll->data->pd_shift);@@ -116,12 +138,19 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, con1 =readl (pll->base_addr +REG_CON1 );if (pll_en) - con1 |=CON0_PCW_CHG ; + con1 |=CON1_PCW_CHG ;writel (con1, pll->base_addr +REG_CON1 );if (pll->tuner_addr)writel (con1 +1 , pll->tuner_addr); +/* restore tuner_en */ +if (tuner_en_addr && tuner_en) { + val =readl (tuner_en_addr); + val |= tuner_en_mask; +writel (val, tuner_en_addr); + } +if (pll_en)udelay (20 ); }
Re: [PATCH v4 01/12] clk: mediatek: Disable tuner_en before change PLL rate
Quoted 65 lines · Matthias Brugger
Quoted 49 lines · Weiyi Lu
From: Owen Chen <[email protected]>
PLLs with
tuner_enbit, such as APLL1, need to disabletuner_enbefore apply new frequency settings, or the new frequency settings (pcw) will not be applied.
Thetuner_enbit will be disabled during changing PLL rate and be restored after new settings applied.
Another minor change is to correct the macro name of pcw change bit toCON1_PCW_CHGbecausePCW_CHG(BIT31)is on CON1.Fixes e2f744a82d725 (clk: mediatek: Add MT2712 clock support)Cc <[email protected]>Signed-off-by Owen Chen <[email protected]>--- drivers/clk/mediatek/clk-pll.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)drivers/clk/mediatek/clk-pll.c +13
-1@@ -27,7 +27,7 @@#define CON0_BASE_EN BIT(0)#define CON0_PWR_ON BIT(0)#define CON0_ISO_EN BIT(1) -#define CON0_PCW_CHG BIT(31) +#define CON1_PCW_CHG BIT(31)#define AUDPLL_TUNER_EN BIT(31)@@ -93,9 +93,31 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, {u32 con1, val;int pll_en; +u32 tuner_en =0 ; +u32 tuner_en_mask; +void __iomem *tuner_en_addr =NULL ; pll_en =readl (pll->base_addr +REG_CON0 ) &CON0_BASE_EN ; +/* disable tuner */ +if (pll->tuner_en_addr) { + tuner_en_addr = pll->tuner_en_addr; + tuner_en_mask =BIT (pll->data->tuner_en_bit); + }else if (pll->tuner_addr) { + tuner_en_addr = pll->tuner_addr; + tuner_en_mask =AUDPLL_TUNER_EN ; + } +drivers/clk/mediatek/clk-pll.c static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, · line 120
Quoted 10 lines
drivers/clk/mediatek/clk-pll.c +10
-0+if (tuner_en_addr) { + val =readl (tuner_en_addr); + tuner_en = val & tuner_en_mask; + +if (tuner_en) { + val &= ~tuner_en_mask; +writel (val, tuner_en_addr); + } + } +Why don't we use a flag here, it would make the code easier to understand. I think it would also help if you put this code in a separate function.
Quoted 3 lines
Regards,
Matthias
Hi Matthias,
I guess you suggest to add a flag (e.g. CLK_TUNER_SUPPORT) and declare the PLL clock with this flag. And inside this mtk_pll_set_rate_regs() function, we could modify it as below. Am I right?
if (pll->data->flags & CLK_TUNER_SUPPORT)
disable_tuner();
[...]
if (pll->data->flags & CLK_TUNER_SUPPORT)
enable_tuner();But I thought this flag might be a customized flags and can only be put in clk-mtk.h not clk-provider.h so far. And it might cause potential problem of clock flag re-definition. May I have more suggestion?
Quoted 26 lines
Quoted 26 lines
drivers/clk/mediatek/clk-pll.c +8
-1/* set postdiv */ val =readl (pll->pd_addr); val &= ~(POSTDIV_MASK << pll->data->pd_shift);@@ -116,12 +138,19 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, con1 =readl (pll->base_addr +REG_CON1 );if (pll_en) - con1 |=CON0_PCW_CHG ; + con1 |=CON1_PCW_CHG ;writel (con1, pll->base_addr +REG_CON1 );if (pll->tuner_addr)writel (con1 +1 , pll->tuner_addr); +/* restore tuner_en */ +if (tuner_en_addr && tuner_en) { + val =readl (tuner_en_addr); + val |= tuner_en_mask; +writel (val, tuner_en_addr); + } +if (pll_en)udelay (20 ); }
Re: [PATCH v4 01/12] clk: mediatek: Disable tuner_en before change PLL rate
Quoted 83 lines · Weiyi Lu
Quoted 65 lines · Matthias Brugger
Quoted 49 lines · Weiyi Lu
From: Owen Chen <[email protected]>
PLLs with
tuner_enbit, such as APLL1, need to disabletuner_enbefore apply new frequency settings, or the new frequency settings (pcw) will not be applied.
Thetuner_enbit will be disabled during changing PLL rate and be restored after new settings applied.
Another minor change is to correct the macro name of pcw change bit toCON1_PCW_CHGbecausePCW_CHG(BIT31)is on CON1.Fixes e2f744a82d725 (clk: mediatek: Add MT2712 clock support)Cc <[email protected]>Signed-off-by Owen Chen <[email protected]>--- drivers/clk/mediatek/clk-pll.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)drivers/clk/mediatek/clk-pll.c +13
-1@@ -27,7 +27,7 @@#define CON0_BASE_EN BIT(0)#define CON0_PWR_ON BIT(0)#define CON0_ISO_EN BIT(1) -#define CON0_PCW_CHG BIT(31) +#define CON1_PCW_CHG BIT(31)#define AUDPLL_TUNER_EN BIT(31)@@ -93,9 +93,31 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, {u32 con1, val;int pll_en; +u32 tuner_en =0 ; +u32 tuner_en_mask; +void __iomem *tuner_en_addr =NULL ; pll_en =readl (pll->base_addr +REG_CON0 ) &CON0_BASE_EN ; +/* disable tuner */ +if (pll->tuner_en_addr) { + tuner_en_addr = pll->tuner_en_addr; + tuner_en_mask =BIT (pll->data->tuner_en_bit); + }else if (pll->tuner_addr) { + tuner_en_addr = pll->tuner_addr; + tuner_en_mask =AUDPLL_TUNER_EN ; + } +drivers/clk/mediatek/clk-pll.c static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, · line 120
Quoted 10 lines
drivers/clk/mediatek/clk-pll.c +10
-0+if (tuner_en_addr) { + val =readl (tuner_en_addr); + tuner_en = val & tuner_en_mask; + +if (tuner_en) { + val &= ~tuner_en_mask; +writel (val, tuner_en_addr); + } + } +Why don't we use a flag here, it would make the code easier to understand. I think it would also help if you put this code in a separate function.
Quoted 3 lines
Regards,
MatthiasHi Matthias,
I guess you suggest to add a flag (e.g.
CLK_TUNER_SUPPORT) and declare the PLL clock with this flag. And inside thismtk_pll_set_rate_regs()function, we could modify it as below. Am I right?if (
pll->data->flags&CLK_TUNER_SUPPORT)disable_tuner(); [...] if (pll->data->flags & CLK_TUNER_SUPPORT) enable_tuner();
Quoted 5 lines
But I thought this flag might be a customized flags and can only be put in
clk-mtk.hnotclk-provider.hso far. And it might cause potential problem of clock flag re-definition. May I have more suggestion?
Please ignore the potential problem I mentioned, I just checked it carefully and that redefinition problem won't happen in current flow. Sorry for having you confused.
But I still need to confirm with you if the method in previous mail is correct? Thanks.
Quoted 27 lines
Quoted 26 lines
Quoted 26 lines
drivers/clk/mediatek/clk-pll.c +8
-1/* set postdiv */ val =readl (pll->pd_addr); val &= ~(POSTDIV_MASK << pll->data->pd_shift);@@ -116,12 +138,19 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, con1 =readl (pll->base_addr +REG_CON1 );if (pll_en) - con1 |=CON0_PCW_CHG ; + con1 |=CON1_PCW_CHG ;writel (con1, pll->base_addr +REG_CON1 );if (pll->tuner_addr)writel (con1 +1 , pll->tuner_addr); +/* restore tuner_en */ +if (tuner_en_addr && tuner_en) { + val =readl (tuner_en_addr); + val |= tuner_en_mask; +writel (val, tuner_en_addr); + } +if (pll_en)udelay (20 ); }
PATCH v4 2/12 clk: mediatek: add new clkmux register API
In reply to Weiyi LuFrom: Owen Chen <[email protected]>
On both MT8183 & MT6765, there add "set/clr" register for each clkmux setting, and one update register to trigger value change. It is designed to prevent read-modify-write racing issue. The sw design need to add a new API to handle this hw change with a new mtk_clk_mux/mtk_mux struct in new file "clk-mux.c", "clk-mux.h".
--- drivers/clk/mediatek/Makefile | 3 +- drivers/clk/mediatek/clk-mux.c | 223 +++++++++++++++++++++++++++++++++ drivers/clk/mediatek/clk-mux.h | 89 +++++++++++++ 3 files changed, 314 insertions(+), 1 deletion(-) create mode 100644 drivers/clk/mediatek/clk-mux.c create mode 100644 drivers/clk/mediatek/clk-mux.h
drivers/clk/mediatek/Makefile +2 -1
@@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_COMMON_CLK_MEDIATEK) += clk-mtk.o clk-pll.o clk-gate.o clk-apmixed.o clk-cpumux.o reset.o +obj-$(CONFIG_COMMON_CLK_MEDIATEK) += clk-mtk.o clk-pll.o clk-gate.o clk-apmixed.o clk-cpumux.o reset.o clk-mux.o + obj-$(CONFIG_COMMON_CLK_MT6797) += clk-mt6797.o obj-$(CONFIG_COMMON_CLK_MT6797_IMGSYS) += clk-mt6797-img.o obj-$(CONFIG_COMMON_CLK_MT6797_MMSYS) += clk-mt6797-mm.o
drivers/clk/mediatek/clk-mux.c new file +223 -0
223 lines not on this page · raw message
drivers/clk/mediatek/clk-mux.h new file +89 -0
89 lines not on this page · raw message
Signature · 1 line
2.18.0
PATCH v4 3/12 clk: mediatek: add configurable pcwibits and fmin to mtk_pll_data
In reply to Weiyi LuFrom: Owen Chen <[email protected]>
1. pcwibits: The integer bits of pcw for plls is extend to 8 bits, add a variable to indicate this change and backward-compatible.
2. fmin: The pll freqency lower-bound is vary from 1GMhz to 1.5Ghz, add a variable to indicate platform-dependent.
--- drivers/clk/mediatek/clk-mtk.h | 2 ++ drivers/clk/mediatek/clk-pll.c | 15 +++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-)
drivers/clk/mediatek/clk-mtk.h +2 -0
@@ -214,8 +214,10 @@ struct mtk_pll_data {unsigned int flags;const struct clk_ops *ops;u32 rst_bar_mask; +unsigned long fmin;unsigned long fmax;int pcwbits; +int pcwibits;uint32_t pcw_reg;int pcw_shift;const struct mtk_pll_div_table *div_table;
drivers/clk/mediatek/clk-pll.c +11 -4
@@ -32,6 +32,8 @@#define AUDPLL_TUNER_EN BIT(31)#define POSTDIV_MASK 0x7 + +/* default 7 bits integer, can be overridden with pcwibits. */ #define INTEGER_BITS 7/*
@@ -68,12 +70,15 @@ static unsigned long __mtk_pll_recalc_rate(struct mtk_clk_pll *pll, u32 fin, u32 pcw, int postdiv) { int pcwbits = pll->data->pcwbits; -int pcwfbits; +int pcwfbits =0 ; +int ibits;u64 vco;u8 c =0 ;/* The fractional part of the PLL divider. */ - pcwfbits = pcwbits >INTEGER_BITS ? pcwbits -INTEGER_BITS :0 ; + ibits = pll->data->pcwibits ? pll->data->pcwibits :INTEGER_BITS ; +if (pcwbits > ibits) + pcwfbits = pcwbits - ibits; vco = (u64 )fin * pcw;
@@ -167,9 +172,10 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw,static void mtk_pll_calc_values (struct mtk_clk_pll *pll,u32 *pcw,u32 *postdiv,u32 freq,u32 fin) { -unsigned long fmin =1000 *MHZ ; +unsigned long fmin = pll->data->fmin ? pll->data->fmin : (1000 *MHZ );const struct mtk_pll_div_table *div_table = pll->data->div_table;u64 _pcw; +int ibits;u32 val;if (freq > pll->data->fmax)
@@ -193,7 +199,8 @@ static void mtk_pll_calc_values(struct mtk_clk_pll *pll, u32 *pcw, u32 *postdiv, }/* _pcw = freq * postdiv / fin * 2^pcwfbits */ - _pcw = ((u64 )freq << val) << (pll->data->pcwbits -INTEGER_BITS ); + ibits = pll->data->pcwibits ? pll->data->pcwibits :INTEGER_BITS ; + _pcw = ((u64 )freq << val) << (pll->data->pcwbits - ibits);do_div (_pcw, fin); *pcw = (u32 )_pcw;
Signature · 1 line
2.18.0
PATCH v4 4/12 soc: mediatek: add new flow for mtcmos power.
In reply to Weiyi LuFrom: Owen Chen <[email protected]>
Both MT8183 & MT6765 add more bus protect node than previous project, therefore we add two more register for setup bus protect, which reside at INFRA_CFG & SMI_COMMON.
With the following change
1. bus protect need not only infracfg but smi_common registers involved to setup. Therefore we add a set/clr APIs with more customize arguments.
The second change is that we also add subsys CG control flow before/after the bus protect/sram control, due to bus protect need SMI bus relative CGs enable to feed-back its ack, and some master's sram control need CG enable to on/off its resource sequentially.
With the following change
1. turn on subsys CG before sram pwron and release bus protect.
2. turn off subsys CG after the process of set bus protect/receive ack/disable sram.
The last change is for some power domains like vpu_core on MT8183 whose sram need to do clock and internal isolation while power on/off sram. We add a flag "sram_iso_ctrl" in scp_domain_data to judge if we need to do the extra sram isolation control or not.
--- drivers/soc/mediatek/Makefile | 2 +- drivers/soc/mediatek/mtk-scpsys-ext.c | 99 +++++++ drivers/soc/mediatek/mtk-scpsys.c | 376 ++++++++++++++++++------ include/linux/soc/mediatek/scpsys-ext.h | 39 +++ 4 files changed, 428 insertions(+), 88 deletions(-) create mode 100644 drivers/soc/mediatek/mtk-scpsys-ext.c create mode 100644 include/linux/soc/mediatek/scpsys-ext.h
drivers/soc/mediatek/Makefile +1 -1
@@ -1,4 +1,4 @@ obj-$(CONFIG_MTK_CMDQ) += mtk-cmdq-helper.o -obj-$(CONFIG_MTK_INFRACFG) += mtk-infracfg.o +obj-$(CONFIG_MTK_INFRACFG) += mtk-infracfg.o mtk-scpsys-ext.o obj-$(CONFIG_MTK_PMIC_WRAP) += mtk-pmic-wrap.o obj-$(CONFIG_MTK_SCPSYS) += mtk-scpsys.o
drivers/soc/mediatek/mtk-scpsys-ext.c new file +99 -0
99 lines not on this page · raw message
drivers/soc/mediatek/mtk-scpsys.c +289 -87
500 lines not on this page · raw message
include/linux/soc/mediatek/scpsys-ext.h new file +39 -0
@@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __SOC_MEDIATEK_SCPSYS_EXT_H +#define __SOC_MEDIATEK_SCPSYS_EXT_H + +#define MAX_STEPS 4 + +#define BUS_PROT (_type, _set_ofs, _clr_ofs, \ + _en_ofs, _sta_ofs, _mask, _clr_ack_mask) { \ + .type = _type, \ + .set_ofs = _set_ofs, \ + .clr_ofs = _clr_ofs, \ + .en_ofs = _en_ofs, \ + .sta_ofs = _sta_ofs, \ + .mask = _mask, \ + .clr_ack_mask = _clr_ack_mask, \ + } + +enum regmap_type { +IFR_TYPE , +SMI_TYPE , +MAX_REGMAP_TYPE , +}; + +struct bus_prot { +enum regmap_type type; +u32 set_ofs; +u32 clr_ofs; +u32 en_ofs; +u32 sta_ofs; +u32 mask; +u32 clr_ack_mask; +}; + +int mtk_scpsys_ext_set_bus_protection (const struct bus_prot *bp_table, +struct regmap *infracfg,struct regmap *smi_common); +int mtk_scpsys_ext_clear_bus_protection (const struct bus_prot *bp_table, +struct regmap *infracfg,struct regmap *smi_common); + +#endif /* __SOC_MEDIATEK_SCPSYS_EXT_H */
Signature · 1 line
2.18.0
Matthias Brugger
maintainerRe: [PATCH v4 04/12] soc: mediatek: add new flow for mtcmos power.
Quoted 20 lines · Weiyi Lu
From: Owen Chen <[email protected]>
Both MT8183 & MT6765 add more bus protect node than previous project, therefore we add two more register for setup bus protect, which reside at
INFRA_CFG&SMI_COMMON.With the following change
1. bus protect need not only infracfg butsmi_commonregisters involved to setup. Therefore we add a set/clr APIs with more customize arguments.The second change is that we also add subsys CG control flow before/after the bus protect/sram control, due to bus protect need SMI bus relative CGs enable to feed-back its ack, and some master's sram control need CG enable to on/off its resource sequentially.
With the following change
1. turn on subsys CG before sram pwron and release bus protect.
2. turn off subsys CG after the process of set bus protect/receive ack/disable sram.
Quoted 5 lines
The last change is for some power domains like
vpu_coreon MT8183 whose sram need to do clock and internal isolation while power on/off sram. We add a flag "sram_iso_ctrl" inscp_domain_datato judge if we need to do the extra sram isolation control or not.
This commit message indicates that you can and should put this changes in several patches. This will make it easier to understand what you are doing and and the reason why you are doing it.
Quoted 34 lines
Signed-off-by Owen Chen <[email protected]>Signed-off-by Mars Cheng <[email protected]>Signed-off-by Weiyi Lu <[email protected]>--- drivers/soc/mediatek/Makefile | 2 +- drivers/soc/mediatek/mtk-scpsys-ext.c | 99 +++++++ drivers/soc/mediatek/mtk-scpsys.c | 376 ++++++++++++++++++------ include/linux/soc/mediatek/scpsys-ext.h | 39 +++ 4 files changed, 428 insertions(+), 88 deletions(-) create mode 100644 drivers/soc/mediatek/mtk-scpsys-ext.c create mode 100644 include/linux/soc/mediatek/scpsys-ext.hdrivers/soc/mediatek/Makefile +1
-1@@ -1,4 +1,4 @@ obj-$(CONFIG_MTK_CMDQ) += mtk-cmdq-helper.o -obj-$(CONFIG_MTK_INFRACFG) += mtk-infracfg.o +obj-$(CONFIG_MTK_INFRACFG) += mtk-infracfg.o mtk-scpsys-ext.o obj-$(CONFIG_MTK_PMIC_WRAP) += mtk-pmic-wrap.o obj-$(CONFIG_MTK_SCPSYS) += mtk-scpsys.odrivers/soc/mediatek/mtk-scpsys-ext.c new file +6
-0@@ -0,0 +1,99 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Owen Chen <[email protected]> +*/ +#include <linux/ktime.h>
drivers/soc/mediatek/mtk-scpsys-ext.c line 16
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +10
-0+#include <linux/mfd/syscon.h> +#include <linux/of_device.h> +#include <linux/regmap.h> +#include <linux/soc/mediatek/scpsys-ext.h> + +#define MTK_POLL_DELAY_US 10 +#define MTK_POLL_TIMEOUT USEC_PER_SEC + +static int set_bus_protection (struct regmap *map,u32 mask,u32 ack_mask, +u32 reg_set,u32 reg_sta,u32 reg_en)
why can't we just use this function for all accesses and get rid of the mtk_infracfg_set_bus_protection?
drivers/soc/mediatek/mtk-scpsys-ext.c line 20
Quoted 4 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +4
-0+{ +u32 val; + +if (reg_set)
just use one variable reg and add a boolean stating if you need write or update. Might make sense to pass a struct here to not bloat the function parameters.
Quoted 20 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +20
-0+regmap_write (map, reg_set, mask); + else +regmap_update_bits (map ,reg_en ,mask ,mask ); + +return regmap_read_poll_timeout (map, reg_sta, + val, (val & ack_mask) == ack_mask, +MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); +} + +static int clear_bus_protection (struct regmap *map,u32 mask,u32 ack_mask, +u32 reg_clr,u32 reg_sta,u32 reg_en) +{ +u32 val; + +if (reg_clr) +regmap_write (map, reg_clr, mask); +else +regmap_update_bits (map, reg_en, mask,0 ); + + return regmap_read_poll_timeout(map, reg_sta,
drivers/soc/mediatek/mtk-scpsys-ext.c line 50
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +10
-0+ val, !(val & ack_mask), + MTK_POLL_DELAY_US, MTK_POLL_TIMEOUT); +} + +int mtk_scpsys_ext_set_bus_protection (const struct bus_prot *bp_table, +struct regmap *infracfg,struct regmap *smi_common) +{ +int i; + +for (i =0 ; i <MAX_STEPS && bp_table[i].mask; i++) {
I'd prefer to pass the number of entries in bp_table here. In any case check for the mask is somehow confusing.
The use of bp_table[i] many times allows to create a local pointer to point to the entry.
Quoted 60 lines
drivers/soc/mediatek/mtk-scpsys-ext.c new file +49
-0+struct regmap *map; +int ret; + +if (bp_table[i].type ==IFR_TYPE ) + map = infracfg; +else if (bp_table[i].type ==SMI_TYPE ) + map = smi_common; +else +return -EINVAL ; + + ret =set_bus_protection (map, + bp_table[i].mask, bp_table[i].mask, + bp_table[i].set_ofs, bp_table[i].sta_ofs, + bp_table[i].en_ofs); + +if (ret) +return ret; + } + +return 0 ; +} + +int mtk_scpsys_ext_clear_bus_protection (const struct bus_prot *bp_table, +struct regmap *infracfg,struct regmap *smi_common) +{ +int i; + +for (i =MAX_STEPS -1 ; i >=0 ; i--) { +struct regmap *map; +int ret; + +if (bp_table[i].type ==IFR_TYPE ) + map = infracfg; +else if (bp_table[i].type ==SMI_TYPE ) + map = smi_common; +else +return -EINVAL ; + + ret =clear_bus_protection (map, + bp_table[i].mask, bp_table[i].clr_ack_mask, + bp_table[i].clr_ofs, bp_table[i].sta_ofs, + bp_table[i].en_ofs); + +if (ret) +return ret; + } + +return 0 ; +}drivers/soc/mediatek/mtk-scpsys.c +0
-6@@ -1,15 +1,7 @@ -/* -* Copyright (c) 2015 Pengutronix, Sascha Hauer <[email protected]> -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation.
drivers/soc/mediatek/mtk-scpsys.c line 4
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +4
-6-* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -*/ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (c) 2015 Pengutronix, Sascha Hauer <[email protected]> +
extra patch please.
Quoted 55 lines
drivers/soc/mediatek/mtk-scpsys.c +25
-2#include <linux/clk.h> #include <linux/init.h> #include <linux/io.h> @@ -20,6 +12,7 @@#include <linux/pm_domain.h> #include <linux/regulator/consumer.h> #include <linux/soc/mediatek/infracfg.h> +#include <linux/soc/mediatek/scpsys-ext.h> #include <dt-bindings/power/mt2701-power.h> #include <dt-bindings/power/mt2712-power.h> @@ -29,7 +22,7 @@#include <dt-bindings/power/mt8173-power.h> #define MTK_POLL_DELAY_US 10 -#define MTK_POLL_TIMEOUT (jiffies_to_usecs(HZ)) +#define MTK_POLL_TIMEOUT USEC_PER_SEC#define MTK_SCPD_ACTIVE_WAKEUP BIT(0)#define MTK_SCPD_FWAIT_SRAM BIT(1)@@ -64,6 +57,8 @@#define PWR_ON_BIT BIT(2)#define PWR_ON_2ND_BIT BIT(3)#define PWR_CLK_DIS_BIT BIT(4) +#define PWR_SRAM_CLKISO_BIT BIT(5) +#define PWR_SRAM_ISOINT_B_BIT BIT(6)#define PWR_STATUS_CONN BIT(1)#define PWR_STATUS_DISP BIT(3)@@ -115,16 +110,40 @@ static const char * const clk_names[] = { };#define MAX_CLKS 3 - +#define MAX_SUBSYS_CLKS 10 + +/** +* struct scp_domain_data - scp domain data for power on/off flow +* @name: The domain name. +* @sta_mask: The mask for power on/off status bit. +* @ctl_offs: The offset for main power control register. +* @sram_iso_ctrl: The flag to judge if the power domain need to do +* the extra sram isolation control. +* @sram_pdn_bits: The mask for sram power control bits. +* @sram_pdn_ack_bits: The mask for sram power control acked bits. +* @bus_prot_mask: The mask for single step bus protection. +* @clk_id: The basic clock needs to be enabled before enabling certain +* power domains. +* @basic_clk_name: provide the same purpose with field "clk_id" +* by declaring basic clock prefix name rather than clk_id. +* @subsys_clk_prefix: The prefix name of the clocks need to be enabled +* before releasing bus protection. +* @caps: The flag for active wake-up action. +* @bp_table: The mask table for multiple step bus protection. +*/
drivers/soc/mediatek/mtk-scpsys.c static const char * const clk_names[] = { · line 143
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +2
-0struct scp_domain_data {const char *name;u32 sta_mask;int ctl_offs; +bool sram_iso_ctrl;u32 sram_pdn_bits;u32 sram_pdn_ack_bits;u32 bus_prot_mask;enum clk_id clk_id[MAX_CLKS ]; +const char *basic_clk_name[MAX_CLKS ];
it is not explained in the commit message why we would need the name here.
Quoted 33 lines
drivers/soc/mediatek/mtk-scpsys.c +11
-0+const char *subsys_clk_prefix;u8 caps; +struct bus_prot bp_table[MAX_STEPS ]; };struct scp ;@@ -133,6 +152,7 @@ struct scp_domain {struct generic_pm_domain genpd;struct scp *scp;struct clk *clk[MAX_CLKS ]; +struct clk *subsys_clk[MAX_SUBSYS_CLKS ];const struct scp_domain_data *data;struct regulator *supply; };@@ -148,6 +168,7 @@ struct scp {struct device *dev;void __iomem *base;struct regmap *infracfg; +struct regmap *smi_common;struct scp_ctrl_reg ctrl_reg;bool bus_prot_reg_update; };@@ -188,32 +209,166 @@ static int scpsys_domain_is_on(struct scp_domain *scpd)return -EINVAL ; } +static int scpsys_regulator_enable (struct scp_domain *scpd) +{ +if (!scpd->supply) +return 0 ; + +return regulator_enable (scpd->supply); +}
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_domain_is_on(struct scp_domain *scpd) · line 228
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +10
-0+ +static int scpsys_regulator_disable (struct scp_domain *scpd) +{ +if (!scpd->supply) +return 0 ; + +return regulator_disable (scpd->supply); +} + +static int scpsys_clk_enable (struct clk *clk[],int max_num)
introducing the clock refactoring should be a seperate patch.
Quoted 19 lines
drivers/soc/mediatek/mtk-scpsys.c +19
-0+{ +int i, ret =0 ; + +for (i =0 ; i < max_num && clk[i]; i++) { + ret =clk_prepare_enable (clk[i]); +if (ret) { +for (--i; i >=0 ; i--) +clk_disable_unprepare (clk[i]); + +break ; + } + } + +return ret; +} + +static int scpsys_clk_disable (struct clk *clk[],int max_num) +{ +int i;
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_domain_is_on(struct scp_domain *scpd) · line 257
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +10
-0+ +for (i = max_num -1 ; i >=0 ; i--) { +if (clk[i]) +clk_disable_unprepare (clk[i]); + } + +return 0 ; +} + +static int scpsys_sram_enable (struct scp_domain *scpd,void __iomem *ctl_addr)
make all the refactoring an extra patch where you just do that without any logical change.
Quoted 63 lines
drivers/soc/mediatek/mtk-scpsys.c +63
-0+{ +u32 val; +u32 pdn_ack = scpd->data->sram_pdn_ack_bits; +int tmp; + + val =readl (ctl_addr) & ~scpd->data->sram_pdn_bits; +writel (val, ctl_addr); + +/* Either wait until SRAM_PDN_ACK all 0 or have a force wait */ +if (MTK_SCPD_CAPS (scpd,MTK_SCPD_FWAIT_SRAM )) { +/* +* Currently, MTK_SCPD_FWAIT_SRAM is necessary only for +* MT7622_POWER_DOMAIN_WB and thus just a trivial setup +* is applied here. +*/ +usleep_range (12000 ,12100 ); + }else { +/* Either wait until SRAM_PDN_ACK all 1 or 0 */ +int ret =readl_poll_timeout (ctl_addr, tmp, + (tmp & pdn_ack) ==0 , +MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); +if (ret <0 ) +return ret; + } + +if (scpd->data->sram_iso_ctrl) { + val =readl (ctl_addr) |PWR_SRAM_ISOINT_B_BIT ; +writel (val, ctl_addr); +udelay (1 ); + val &= ~PWR_SRAM_CLKISO_BIT ; +writel (val, ctl_addr); + } + +return 0 ; +} + +static int scpsys_sram_disable (struct scp_domain *scpd,void __iomem *ctl_addr) +{ +u32 val; +u32 pdn_ack = scpd->data->sram_pdn_ack_bits; +int tmp; + +if (scpd->data->sram_iso_ctrl) { + val =readl (ctl_addr); + val |=PWR_SRAM_CLKISO_BIT ; +writel (val, ctl_addr); + val &= ~PWR_SRAM_ISOINT_B_BIT ; +writel (val, ctl_addr); +udelay (1 ); + } + + val =readl (ctl_addr) | scpd->data->sram_pdn_bits; +writel (val, ctl_addr); + +/* Either wait until SRAM_PDN_ACK all 1 or 0 */ +return readl_poll_timeout (ctl_addr, tmp, + (tmp & pdn_ack) == pdn_ack, +MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); +} + +static int scpsys_bus_protect_enable (struct scp_domain *scpd) +{ +struct scp *scp = scpd->scp;
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_domain_is_on(struct scp_domain *scpd) · line 330
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +10
-0+int ret =0 ; + +if (scpd->data->bus_prot_mask) { + ret =mtk_infracfg_set_bus_protection (scp->infracfg, + scpd->data->bus_prot_mask, + scp->bus_prot_reg_update); + }else if (scpd->data->bp_table[0 ].mask) { + ret =mtk_scpsys_ext_set_bus_protection (scpd->data->bp_table, + scp->infracfg, + scp->smi_common);
Please change all existing domains with a bus_prot_mask to use a bp_table with one entry. I suppose one patch would be adding the bp_table infrastructure and following one will change all domains. Just have a look what is more elegant.
Quoted 68 lines
drivers/soc/mediatek/mtk-scpsys.c +31
-20+ } + +return ret; +} + +static int scpsys_bus_protect_disable (struct scp_domain *scpd) +{ +struct scp *scp = scpd->scp; +int ret =0 ; + +if (scpd->data->bus_prot_mask) { + ret =mtk_infracfg_clear_bus_protection (scp->infracfg, + scpd->data->bus_prot_mask, + scp->bus_prot_reg_update); + }else if (scpd->data->bp_table[0 ].mask) { + ret =mtk_scpsys_ext_clear_bus_protection ( + scpd->data->bp_table, + scp->infracfg, + scp->smi_common); + } + +return ret; +} +static int scpsys_power_on (struct generic_pm_domain *genpd) { struct scp_domain *scpd = container_of(genpd, struct scp_domain, genpd);struct scp *scp = scpd->scp;void __iomem *ctl_addr = scp->base + scpd->data->ctl_offs; -u32 pdn_ack = scpd->data->sram_pdn_ack_bits;u32 val;int ret, tmp; -int i; -if (scpd->supply) { - ret =regulator_enable (scpd->supply); -if (ret) -return ret; - } - -for (i =0 ; i <MAX_CLKS && scpd->clk[i]; i++) { - ret =clk_prepare_enable (scpd->clk[i]); -if (ret) { -for (--i; i >=0 ; i--) -clk_disable_unprepare (scpd->clk[i]); + ret =scpsys_regulator_enable (scpd); +if (ret <0 ) +return ret; - goto err_clk; - } - } + ret =scpsys_clk_enable (scpd->clk,MAX_CLKS ); +if (ret) + goto err_clk; +/* subsys power on */ val =readl (ctl_addr); val |=PWR_ON_BIT ;writel (val, ctl_addr);@@ -235,43 +390,26 @@ static int scpsys_power_on(struct generic_pm_domain *genpd) val |=PWR_RST_B_BIT ;writel (val, ctl_addr); - val &= ~scpd->data->sram_pdn_bits; -writel (val, ctl_addr); - -/* Either wait until SRAM_PDN_ACK all 0 or have a force wait */
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_power_on(struct generic_pm_domain *genpd) · line 395
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +3
-7-if (MTK_SCPD_CAPS (scpd,MTK_SCPD_FWAIT_SRAM )) { -/* -* Currently, MTK_SCPD_FWAIT_SRAM is necessary only for -* MT7622_POWER_DOMAIN_WB and thus just a trivial setup is -* applied here. -*/ -usleep_range (12000 ,12100 ); + ret =scpsys_clk_enable (scpd->subsys_clk,MAX_SUBSYS_CLKS ); +if (ret <0 ) + goto err_pwr_ack;
in between all this refactoring it is difficult to find the relevant change, so please try to think about the maintainer when doing changes to the code base, as he has to understand and accept (hopefully in this order ;) your code.
Quoted 98 lines
drivers/soc/mediatek/mtk-scpsys.c +23
-39- }else { - ret =readl_poll_timeout (ctl_addr, tmp, (tmp & pdn_ack) ==0 , -MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); -if (ret <0 ) - goto err_pwr_ack; - } + ret =scpsys_sram_enable (scpd, ctl_addr); +if (ret <0 ) + goto err_sram; -if (scpd->data->bus_prot_mask) { - ret =mtk_infracfg_clear_bus_protection (scp->infracfg, - scpd->data->bus_prot_mask, - scp->bus_prot_reg_update); -if (ret) - goto err_pwr_ack; - } + ret =scpsys_bus_protect_disable (scpd); +if (ret <0 ) + goto err_sram;return 0 ; +err_sram: +scpsys_clk_disable (scpd->subsys_clk,MAX_SUBSYS_CLKS ); err_pwr_ack: -for (i =MAX_CLKS -1 ; i >=0 ; i--) { -if (scpd->clk[i]) -clk_disable_unprepare (scpd->clk[i]); - } +scpsys_clk_disable (scpd->clk,MAX_CLKS ); err_clk: -if (scpd->supply) -regulator_disable (scpd->supply); +scpsys_regulator_disable (scpd);dev_err (scp->dev,"Failed to power on domain %s\n" , genpd->name);@@ -283,29 +421,21 @@ static int scpsys_power_off(struct generic_pm_domain *genpd) struct scp_domain *scpd = container_of(genpd, struct scp_domain, genpd);struct scp *scp = scpd->scp;void __iomem *ctl_addr = scp->base + scpd->data->ctl_offs; -u32 pdn_ack = scpd->data->sram_pdn_ack_bits;u32 val;int ret, tmp; -int i; - -if (scpd->data->bus_prot_mask) { - ret =mtk_infracfg_set_bus_protection (scp->infracfg, - scpd->data->bus_prot_mask, - scp->bus_prot_reg_update); -if (ret) - goto out; - } - val =readl (ctl_addr); - val |= scpd->data->sram_pdn_bits; -writel (val, ctl_addr); + ret =scpsys_bus_protect_enable (scpd); +if (ret <0 ) + goto out; -/* wait until SRAM_PDN_ACK all 1 */ - ret =readl_poll_timeout (ctl_addr, tmp, (tmp & pdn_ack) == pdn_ack, -MTK_POLL_DELAY_US ,MTK_POLL_TIMEOUT ); + ret =scpsys_sram_disable (scpd, ctl_addr);if (ret <0 ) goto out; + ret =scpsys_clk_disable (scpd->subsys_clk,MAX_SUBSYS_CLKS ); + +/* subsys power off */ + val =readl (ctl_addr); val |=PWR_ISO_BIT ;writel (val, ctl_addr);@@ -327,11 +457,9 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)if (ret <0 ) goto out; -for (i =0 ; i <MAX_CLKS && scpd->clk[i]; i++) -clk_disable_unprepare (scpd->clk[i]); +scpsys_clk_disable (scpd->clk,MAX_CLKS ); -if (scpd->supply) -regulator_disable (scpd->supply); +scpsys_regulator_disable (scpd);return 0 ;@@ -341,6 +469,48 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)return ret; } +static int init_subsys_clks (struct platform_device *pdev, +const char *prefix,struct clk **clk) +{
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_power_off(struct generic_pm_domain *genpd) · line 484
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +10
-0+struct device_node *node = pdev->dev.of_node; +u32 prefix_len, sub_clk_cnt =0 ; +struct property *prop; +const char *clk_name; + +if (!node) { +dev_err (&pdev->dev,"Cannot find scpsys node: %ld\n" , +PTR_ERR (node)); +return PTR_ERR (node); + }
You are changing the way the devicetree node looks like, please add a patch adding the information to the binding.
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_power_off(struct generic_pm_domain *genpd) · line 495
Quoted 11 lines
drivers/soc/mediatek/mtk-scpsys.c +11
-0+ + prefix_len =strlen (prefix); + +of_property_for_each_string (node,"clock-names" , prop, clk_name) { +if (!strncmp (clk_name, prefix, prefix_len) && + (clk_name[prefix_len] =='-' )) { +if (sub_clk_cnt >=MAX_SUBSYS_CLKS ) { +dev_err (&pdev->dev, +"subsys clk out of range %d\n" , + sub_clk_cnt); +return -ENOMEM ;
ENOMEM?
drivers/soc/mediatek/mtk-scpsys.c static int scpsys_power_off(struct generic_pm_domain *genpd) · line 500
Quoted 5 lines
drivers/soc/mediatek/mtk-scpsys.c +5
-0+ } + + clk[sub_clk_cnt] =devm_clk_get (&pdev->dev, + clk_name); +
to be honest I'm not sure what you are doing here. You are creating the clock names to get them from the CCF, but why can't you use some of_clk_get* accessors?
Quoted 17 lines
drivers/soc/mediatek/mtk-scpsys.c +13
-0+if (IS_ERR (clk)) { +dev_err (&pdev->dev, +"Subsys clk read fail %ld\n" , +PTR_ERR (clk)); +return PTR_ERR (clk); + } + sub_clk_cnt++; + } + } + +return sub_clk_cnt; +} +static void init_clks (struct platform_device *pdev,struct clk **clk) {int i;
drivers/soc/mediatek/mtk-scpsys.c static struct scp *init_scp(struct platform_device *pdev, · line 574
Quoted 9 lines
drivers/soc/mediatek/mtk-scpsys.c +6
-0@@ -396,6 +566,17 @@ static struct scp *init_scp(struct platform_device *pdev,return ERR_CAST (scp->infracfg); } + scp->smi_common =syscon_regmap_lookup_by_phandle (pdev->dev.of_node, +"smi_comm" ); + +if (scp->smi_common ==ERR_PTR (-ENODEV )) { + scp->smi_common =NULL ; + }else if (IS_ERR (scp->smi_common)) {
if error:
if it's ENODEV:
set smi_common to NULL
else: error out.
Quoted 34 lines
drivers/soc/mediatek/mtk-scpsys.c +14
-6+dev_err (&pdev->dev,"Cannot find smi_common controller: %ld\n" , +PTR_ERR (scp->smi_common)); +return ERR_CAST (scp->smi_common); + } +for (i =0 ; i < num; i++) {struct scp_domain *scpd = &scp->domains[i];const struct scp_domain_data *data = &scp_domain_data[i];@@ -417,22 +598,43 @@ static struct scp *init_scp(struct platform_device *pdev,struct scp_domain *scpd = &scp->domains[i];struct generic_pm_domain *genpd = &scpd->genpd;const struct scp_domain_data *data = &scp_domain_data[i]; +int clk_cnt; pd_data->domains[i] = genpd; scpd->scp = scp; scpd->data = data; -for (j =0 ; j <MAX_CLKS && data->clk_id[j]; j++) { -struct clk *c = clk[data->clk_id[j]]; +if (data->clk_id[0 ]) { +for (j =0 ; j <MAX_CLKS && data->clk_id[j]; j++) { +struct clk *c = clk[data->clk_id[j]]; -if (IS_ERR (c)) { -dev_err (&pdev->dev,"%s: clk unavailable\n" , - data->name); -return ERR_CAST (c); +if (IS_ERR (c)) { +dev_err (&pdev->dev, +"%s: clk unavailable\n" , + data->name); +return ERR_CAST (c);
drivers/soc/mediatek/mtk-scpsys.c static struct scp *init_scp(struct platform_device *pdev, · line 626
Quoted 10 lines
drivers/soc/mediatek/mtk-scpsys.c +9
-0+ } + + scpd->clk[j] = c; } + }else if (data->basic_clk_name[0 ]) { +for (j =0 ; j <MAX_CLKS && + data->basic_clk_name[j]; j++) + scpd->clk[j] =devm_clk_get (&pdev->dev, + data->basic_clk_name[j]); + }
You have to explain why we need this basic clocks and why we can't get them in init_clk
Regards,
Matthias
Quoted 61 lines
drivers/soc/mediatek/mtk-scpsys.c +10
-1- scpd->clk[j] = c; +if (data->subsys_clk_prefix) { + clk_cnt =init_subsys_clks (pdev, + data->subsys_clk_prefix, + scpd->subsys_clk); +if (clk_cnt <0 ) { +dev_err (&pdev->dev, +"%s: subsys clk unavailable\n" , + data->name); +return ERR_PTR (clk_cnt); + } } genpd->name = data->name;include/linux/soc/mediatek/scpsys-ext.h new file +39
-0@@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __SOC_MEDIATEK_SCPSYS_EXT_H +#define __SOC_MEDIATEK_SCPSYS_EXT_H + +#define MAX_STEPS 4 + +#define BUS_PROT (_type, _set_ofs, _clr_ofs, \ + _en_ofs, _sta_ofs, _mask, _clr_ack_mask) { \ + .type = _type, \ + .set_ofs = _set_ofs, \ + .clr_ofs = _clr_ofs, \ + .en_ofs = _en_ofs, \ + .sta_ofs = _sta_ofs, \ + .mask = _mask, \ + .clr_ack_mask = _clr_ack_mask, \ + } + +enum regmap_type { +IFR_TYPE , +SMI_TYPE , +MAX_REGMAP_TYPE , +}; + +struct bus_prot { +enum regmap_type type; +u32 set_ofs; +u32 clr_ofs; +u32 en_ofs; +u32 sta_ofs; +u32 mask; +u32 clr_ack_mask; +}; + +int mtk_scpsys_ext_set_bus_protection (const struct bus_prot *bp_table, +struct regmap *infracfg,struct regmap *smi_common); +int mtk_scpsys_ext_clear_bus_protection (const struct bus_prot *bp_table, +struct regmap *infracfg,struct regmap *smi_common); + +#endif /* __SOC_MEDIATEK_SCPSYS_EXT_H */
PATCH v4 5/12 dt-bindings: ARM: Mediatek: Document bindings for MT8183
In reply to Weiyi LuThis patch adds the binding documentation for apmixedsys, audiosys, camsys, imgsys, infracfg, mcucfg, mfgcfg, mmsys, topckgen, vdecsys, vencsys and ipu for Mediatek MT8183.
--- .../arm/mediatek/mediatek,apmixedsys.txt | 1 + .../bindings/arm/mediatek/mediatek,audsys.txt | 1 + .../bindings/arm/mediatek/mediatek,camsys.txt | 22 ++++++++++ .../bindings/arm/mediatek/mediatek,imgsys.txt | 1 + .../arm/mediatek/mediatek,infracfg.txt | 1 + .../bindings/arm/mediatek/mediatek,ipu.txt | 43 +++++++++++++++++++ .../bindings/arm/mediatek/mediatek,mcucfg.txt | 1 + .../bindings/arm/mediatek/mediatek,mfgcfg.txt | 1 + .../bindings/arm/mediatek/mediatek,mmsys.txt | 1 + .../arm/mediatek/mediatek,topckgen.txt | 1 + .../arm/mediatek/mediatek,vdecsys.txt | 1 + .../arm/mediatek/mediatek,vencsys.txt | 1 + 12 files changed, 75 insertions(+) create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,camsys.txt create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,ipu.txt
Documentation/devicetree/bindings/arm/mediatek/mediatek,apmixedsys.txt +1 -0
@@ -14,6 +14,7 @@ Required Properties: - "mediatek,mt7629-apmixedsys" - "mediatek,mt8135-apmixedsys" - "mediatek,mt8173-apmixedsys" + - "mediatek,mt8183-apmixedsys", "syscon" - #clock-cells: Must be 1 The apmixedsys controller uses the common clk binding from
Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt +1 -0
@@ -9,6 +9,7 @@ Required Properties: - "mediatek,mt2701-audsys", "syscon" - "mediatek,mt7622-audsys", "syscon" - "mediatek,mt7623-audsys", "mediatek,mt2701-audsys", "syscon" + - "mediatek,mt8183-audiosys", "syscon" - #clock-cells: Must be 1 The AUDSYS controller uses the common clk binding from
Documentation/devicetree/bindings/arm/mediatek/mediatek,camsys.txt new file +22 -0
@@ -0,0 +1,22 @@ +MediaTek CAMSYS controller +============================ + +The MediaTek camsys controller provides various clocks to the system. + +Required Properties: + +- compatible: Should be one of: + - "mediatek,mt8183-camsys", "syscon" +- #clock-cells: Must be 1 + +The camsys controller uses the common clk binding from +Documentation/devicetree/bindings/clock/clock-bindings.txt +The available clocks are defined in dt-bindings/clock/mt*-clk.h. + +Example: + +camsys: camsys@1a000000 { + compatible = "mediatek,mt8183-camsys", "syscon"; + reg = <0 0x1a000000 0 0x1000>; + #clock-cells = <1>; +};
Documentation/devicetree/bindings/arm/mediatek/mediatek,imgsys.txt +1 -0
@@ -11,6 +11,7 @@ Required Properties: - "mediatek,mt6797-imgsys", "syscon" - "mediatek,mt7623-imgsys", "mediatek,mt2701-imgsys", "syscon" - "mediatek,mt8173-imgsys", "syscon" + - "mediatek,mt8183-imgsys", "syscon" - #clock-cells: Must be 1 The imgsys controller uses the common clk binding from
Documentation/devicetree/bindings/arm/mediatek/mediatek,infracfg.txt +1 -0
@@ -15,6 +15,7 @@ Required Properties: - "mediatek,mt7629-infracfg", "syscon" - "mediatek,mt8135-infracfg", "syscon" - "mediatek,mt8173-infracfg", "syscon" + - "mediatek,mt8183-infracfg", "syscon" - #clock-cells: Must be 1 - #reset-cells: Must be 1
Documentation/devicetree/bindings/arm/mediatek/mediatek,ipu.txt new file +43 -0
43 lines not on this page · raw message
Documentation/devicetree/bindings/arm/mediatek/mediatek,mcucfg.txt +1 -0
@@ -7,6 +7,7 @@ Required Properties: - compatible: Should be one of: - "mediatek,mt2712-mcucfg", "syscon" + - "mediatek,mt8183-mcucfg", "syscon" - #clock-cells: Must be 1 The mcucfg controller uses the common clk binding from
Documentation/devicetree/bindings/arm/mediatek/mediatek,mfgcfg.txt +1 -0
@@ -7,6 +7,7 @@ Required Properties: - compatible: Should be one of: - "mediatek,mt2712-mfgcfg", "syscon" + - "mediatek,mt8183-mfgcfg", "syscon" - #clock-cells: Must be 1 The mfgcfg controller uses the common clk binding from
Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt +1 -0
@@ -11,6 +11,7 @@ Required Properties: - "mediatek,mt6797-mmsys", "syscon" - "mediatek,mt7623-mmsys", "mediatek,mt2701-mmsys", "syscon" - "mediatek,mt8173-mmsys", "syscon" + - "mediatek,mt8183-mmsys", "syscon" - #clock-cells: Must be 1 The mmsys controller uses the common clk binding from
Documentation/devicetree/bindings/arm/mediatek/mediatek,topckgen.txt +1 -0
@@ -14,6 +14,7 @@ Required Properties: - "mediatek,mt7629-topckgen" - "mediatek,mt8135-topckgen" - "mediatek,mt8173-topckgen" + - "mediatek,mt8183-topckgen", "syscon" - #clock-cells: Must be 1 The topckgen controller uses the common clk binding from
Documentation/devicetree/bindings/arm/mediatek/mediatek,vdecsys.txt +1 -0
@@ -11,6 +11,7 @@ Required Properties: - "mediatek,mt6797-vdecsys", "syscon" - "mediatek,mt7623-vdecsys", "mediatek,mt2701-vdecsys", "syscon" - "mediatek,mt8173-vdecsys", "syscon" + - "mediatek,mt8183-vdecsys", "syscon" - #clock-cells: Must be 1 The vdecsys controller uses the common clk binding from
Documentation/devicetree/bindings/arm/mediatek/mediatek,vencsys.txt +1 -0
@@ -9,6 +9,7 @@ Required Properties: - "mediatek,mt2712-vencsys", "syscon" - "mediatek,mt6797-vencsys", "syscon" - "mediatek,mt8173-vencsys", "syscon" + - "mediatek,mt8183-vencsys", "syscon" - #clock-cells: Must be 1 The vencsys controller uses the common clk binding from
Signature · 1 line
2.18.0
PATCH v4 6/12 clk: mediatek: Add dt-bindings for MT8183 clocks
In reply to Weiyi LuAdd MT8183 clock dt-bindings, include topckgen, apmixedsys, infracfg, mcucfg and subsystem clocks.
--- include/dt-bindings/clock/mt8183-clk.h | 422 +++++++++++++++++++++++++ 1 file changed, 422 insertions(+) create mode 100644 include/dt-bindings/clock/mt8183-clk.h
include/dt-bindings/clock/mt8183-clk.h new file +422 -0
@@ -0,0 +1,422 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2018 MediaTek Inc. +* Author: Weiyi Lu <[email protected]> +*/ + +#ifndef _DT_BINDINGS_CLK_MT8183_H +#define _DT_BINDINGS_CLK_MT8183_H + +/* APMIXED */ +#define CLK_APMIXED_ARMPLL_LL 0 +#define CLK_APMIXED_ARMPLL_L 1 +#define CLK_APMIXED_CCIPLL 2 +#define CLK_APMIXED_MAINPLL 3 +#define CLK_APMIXED_UNIV2PLL 4 +#define CLK_APMIXED_MSDCPLL 5 +#define CLK_APMIXED_MMPLL 6 +#define CLK_APMIXED_MFGPLL 7 +#define CLK_APMIXED_TVDPLL 8 +#define CLK_APMIXED_APLL1 9 +#define CLK_APMIXED_APLL2 10 +#define CLK_APMIXED_SSUSB_26M 11 +#define CLK_APMIXED_APPLL_26M 12 +#define CLK_APMIXED_MIPIC0_26M 13 +#define CLK_APMIXED_MDPLLGP_26M 14 +#define CLK_APMIXED_MMSYS_26M 15 +#define CLK_APMIXED_UFS_26M 16 +#define CLK_APMIXED_MIPIC1_26M 17 +#define CLK_APMIXED_MEMPLL_26M 18 +#define CLK_APMIXED_CLKSQ_LVPLL_26M 19 +#define CLK_APMIXED_MIPID0_26M 20 +#define CLK_APMIXED_MIPID1_26M 21 +#define CLK_APMIXED_NR_CLK 22 + +/* TOPCKGEN */ +#define CLK_TOP_MUX_AXI 0 +#define CLK_TOP_MUX_MM 1 +#define CLK_TOP_MUX_CAM 2 +#define CLK_TOP_MUX_MFG 3 +#define CLK_TOP_MUX_CAMTG 4 +#define CLK_TOP_MUX_UART 5 +#define CLK_TOP_MUX_SPI 6 +#define CLK_TOP_MUX_MSDC50_0_HCLK 7 +#define CLK_TOP_MUX_MSDC50_0 8 +#define CLK_TOP_MUX_MSDC30_1 9 +#define CLK_TOP_MUX_MSDC30_2 10 +#define CLK_TOP_MUX_AUDIO 11 +#define CLK_TOP_MUX_AUD_INTBUS 12 +#define CLK_TOP_MUX_FPWRAP_ULPOSC 13 +#define CLK_TOP_MUX_SCP 14 +#define CLK_TOP_MUX_ATB 15 +#define CLK_TOP_MUX_SSPM 16 +#define CLK_TOP_MUX_DPI0 17 +#define CLK_TOP_MUX_SCAM 18 +#define CLK_TOP_MUX_AUD_1 19 +#define CLK_TOP_MUX_AUD_2 20 +#define CLK_TOP_MUX_DISP_PWM 21 +#define CLK_TOP_MUX_SSUSB_TOP_XHCI 22 +#define CLK_TOP_MUX_USB_TOP 23 +#define CLK_TOP_MUX_SPM 24 +#define CLK_TOP_MUX_I2C 25 +#define CLK_TOP_MUX_F52M_MFG 26 +#define CLK_TOP_MUX_SENINF 27 +#define CLK_TOP_MUX_DXCC 28 +#define CLK_TOP_MUX_CAMTG2 29 +#define CLK_TOP_MUX_AUD_ENG1 30 +#define CLK_TOP_MUX_AUD_ENG2 31 +#define CLK_TOP_MUX_FAES_UFSFDE 32 +#define CLK_TOP_MUX_FUFS 33 +#define CLK_TOP_MUX_IMG 34 +#define CLK_TOP_MUX_DSP 35 +#define CLK_TOP_MUX_DSP1 36 +#define CLK_TOP_MUX_DSP2 37 +#define CLK_TOP_MUX_IPU_IF 38 +#define CLK_TOP_MUX_CAMTG3 39 +#define CLK_TOP_MUX_CAMTG4 40 +#define CLK_TOP_MUX_PMICSPI 41 +#define CLK_TOP_SYSPLL_CK 42 +#define CLK_TOP_SYSPLL_D2 43 +#define CLK_TOP_SYSPLL_D3 44 +#define CLK_TOP_SYSPLL_D5 45 +#define CLK_TOP_SYSPLL_D7 46 +#define CLK_TOP_SYSPLL_D2_D2 47 +#define CLK_TOP_SYSPLL_D2_D4 48 +#define CLK_TOP_SYSPLL_D2_D8 49 +#define CLK_TOP_SYSPLL_D2_D16 50 +#define CLK_TOP_SYSPLL_D3_D2 51 +#define CLK_TOP_SYSPLL_D3_D4 52 +#define CLK_TOP_SYSPLL_D3_D8 53 +#define CLK_TOP_SYSPLL_D5_D2 54 +#define CLK_TOP_SYSPLL_D5_D4 55 +#define CLK_TOP_SYSPLL_D7_D2 56 +#define CLK_TOP_SYSPLL_D7_D4 57 +#define CLK_TOP_UNIVPLL_CK 58 +#define CLK_TOP_UNIVPLL_D2 59 +#define CLK_TOP_UNIVPLL_D3 60 +#define CLK_TOP_UNIVPLL_D5 61 +#define CLK_TOP_UNIVPLL_D7 62 +#define CLK_TOP_UNIVPLL_D2_D2 63 +#define CLK_TOP_UNIVPLL_D2_D4 64 +#define CLK_TOP_UNIVPLL_D2_D8 65 +#define CLK_TOP_UNIVPLL_D3_D2 66 +#define CLK_TOP_UNIVPLL_D3_D4 67 +#define CLK_TOP_UNIVPLL_D3_D8 68 +#define CLK_TOP_UNIVPLL_D5_D2 69 +#define CLK_TOP_UNIVPLL_D5_D4 70 +#define CLK_TOP_UNIVPLL_D5_D8 71 +#define CLK_TOP_APLL1_CK 72 +#define CLK_TOP_APLL1_D2 73 +#define CLK_TOP_APLL1_D4 74 +#define CLK_TOP_APLL1_D8 75 +#define CLK_TOP_APLL2_CK 76 +#define CLK_TOP_APLL2_D2 77 +#define CLK_TOP_APLL2_D4 78 +#define CLK_TOP_APLL2_D8 79 +#define CLK_TOP_TVDPLL_CK 80 +#define CLK_TOP_TVDPLL_D2 81 +#define CLK_TOP_TVDPLL_D4 82 +#define CLK_TOP_TVDPLL_D8 83 +#define CLK_TOP_TVDPLL_D16 84 +#define CLK_TOP_MSDCPLL_CK 85 +#define CLK_TOP_MSDCPLL_D2 86 +#define CLK_TOP_MSDCPLL_D4 87 +#define CLK_TOP_MSDCPLL_D8 88 +#define CLK_TOP_MSDCPLL_D16 89 +#define CLK_TOP_AD_OSC_CK 90 +#define CLK_TOP_OSC_D2 91 +#define CLK_TOP_OSC_D4 92 +#define CLK_TOP_OSC_D8 93 +#define CLK_TOP_OSC_D16 94 +#define CLK_TOP_F26M_CK_D2 95 +#define CLK_TOP_MFGPLL_CK 96 +#define CLK_TOP_UNIVP_192M_CK 97 +#define CLK_TOP_UNIVP_192M_D2 98 +#define CLK_TOP_UNIVP_192M_D4 99 +#define CLK_TOP_UNIVP_192M_D8 100 +#define CLK_TOP_UNIVP_192M_D16 101 +#define CLK_TOP_UNIVP_192M_D32 102 +#define CLK_TOP_MMPLL_CK 103 +#define CLK_TOP_MMPLL_D4 104 +#define CLK_TOP_MMPLL_D4_D2 105 +#define CLK_TOP_MMPLL_D4_D4 106 +#define CLK_TOP_MMPLL_D5 107 +#define CLK_TOP_MMPLL_D5_D2 108 +#define CLK_TOP_MMPLL_D5_D4 109 +#define CLK_TOP_MMPLL_D6 110 +#define CLK_TOP_MMPLL_D7 111 +#define CLK_TOP_CLK26M 112 +#define CLK_TOP_CLK13M 113 +#define CLK_TOP_ULPOSC 114 +#define CLK_TOP_UNIVP_192M 115 +#define CLK_TOP_MUX_APLL_I2S0 116 +#define CLK_TOP_MUX_APLL_I2S1 117 +#define CLK_TOP_MUX_APLL_I2S2 118 +#define CLK_TOP_MUX_APLL_I2S3 119 +#define CLK_TOP_MUX_APLL_I2S4 120 +#define CLK_TOP_MUX_APLL_I2S5 121 +#define CLK_TOP_APLL12_DIV0 122 +#define CLK_TOP_APLL12_DIV1 123 +#define CLK_TOP_APLL12_DIV2 124 +#define CLK_TOP_APLL12_DIV3 125 +#define CLK_TOP_APLL12_DIV4 126 +#define CLK_TOP_APLL12_DIVB 127 +#define CLK_TOP_UNIVPLL 128 +#define CLK_TOP_ARMPLL_DIV_PLL1 129 +#define CLK_TOP_ARMPLL_DIV_PLL2 130 +#define CLK_TOP_UNIVPLL_D3_D16 131 +#define CLK_TOP_NR_CLK 132 + +/* CAMSYS */ +#define CLK_CAM_LARB6 0 +#define CLK_CAM_DFP_VAD 1 +#define CLK_CAM_CAM 2 +#define CLK_CAM_CAMTG 3 +#define CLK_CAM_SENINF 4 +#define CLK_CAM_CAMSV0 5 +#define CLK_CAM_CAMSV1 6 +#define CLK_CAM_CAMSV2 7 +#define CLK_CAM_CCU 8 +#define CLK_CAM_LARB3 9 +#define CLK_CAM_NR_CLK 10 + +/* INFRACFG_AO */ +#define CLK_INFRA_PMIC_TMR 0 +#define CLK_INFRA_PMIC_AP 1 +#define CLK_INFRA_PMIC_MD 2 +#define CLK_INFRA_PMIC_CONN 3 +#define CLK_INFRA_SCPSYS 4 +#define CLK_INFRA_SEJ 5 +#define CLK_INFRA_APXGPT 6 +#define CLK_INFRA_ICUSB 7 +#define CLK_INFRA_GCE 8 +#define CLK_INFRA_THERM 9 +#define CLK_INFRA_I2C0 10 +#define CLK_INFRA_I2C1 11 +#define CLK_INFRA_I2C2 12 +#define CLK_INFRA_I2C3 13 +#define CLK_INFRA_PWM_HCLK 14 +#define CLK_INFRA_PWM1 15 +#define CLK_INFRA_PWM2 16 +#define CLK_INFRA_PWM3 17 +#define CLK_INFRA_PWM4 18 +#define CLK_INFRA_PWM 19 +#define CLK_INFRA_UART0 20 +#define CLK_INFRA_UART1 21 +#define CLK_INFRA_UART2 22 +#define CLK_INFRA_UART3 23 +#define CLK_INFRA_GCE_26M 24 +#define CLK_INFRA_CQ_DMA_FPC 25 +#define CLK_INFRA_BTIF 26 +#define CLK_INFRA_SPI0 27 +#define CLK_INFRA_MSDC0 28 +#define CLK_INFRA_MSDC1 29 +#define CLK_INFRA_MSDC2 30 +#define CLK_INFRA_MSDC0_SCK 31 +#define CLK_INFRA_DVFSRC 32 +#define CLK_INFRA_GCPU 33 +#define CLK_INFRA_TRNG 34 +#define CLK_INFRA_AUXADC 35 +#define CLK_INFRA_CPUM 36 +#define CLK_INFRA_CCIF1_AP 37 +#define CLK_INFRA_CCIF1_MD 38 +#define CLK_INFRA_AUXADC_MD 39 +#define CLK_INFRA_MSDC1_SCK 40 +#define CLK_INFRA_MSDC2_SCK 41 +#define CLK_INFRA_AP_DMA 42 +#define CLK_INFRA_XIU 43 +#define CLK_INFRA_DEVICE_APC 44 +#define CLK_INFRA_CCIF_AP 45 +#define CLK_INFRA_DEBUGSYS 46 +#define CLK_INFRA_AUDIO 47 +#define CLK_INFRA_CCIF_MD 48 +#define CLK_INFRA_DXCC_SEC_CORE 49 +#define CLK_INFRA_DXCC_AO 50 +#define CLK_INFRA_DRAMC_F26M 51 +#define CLK_INFRA_IRTX 52 +#define CLK_INFRA_DISP_PWM 53 +#define CLK_INFRA_CLDMA_BCLK 54 +#define CLK_INFRA_AUDIO_26M_BCLK 55 +#define CLK_INFRA_SPI1 56 +#define CLK_INFRA_I2C4 57 +#define CLK_INFRA_MODEM_TEMP_SHARE 58 +#define CLK_INFRA_SPI2 59 +#define CLK_INFRA_SPI3 60 +#define CLK_INFRA_UNIPRO_SCK 61 +#define CLK_INFRA_UNIPRO_TICK 62 +#define CLK_INFRA_UFS_MP_SAP_BCLK 63 +#define CLK_INFRA_MD32_BCLK 64 +#define CLK_INFRA_SSPM 65 +#define CLK_INFRA_UNIPRO_MBIST 66 +#define CLK_INFRA_SSPM_BUS_HCLK 67 +#define CLK_INFRA_I2C5 68 +#define CLK_INFRA_I2C5_ARBITER 69 +#define CLK_INFRA_I2C5_IMM 70 +#define CLK_INFRA_I2C1_ARBITER 71 +#define CLK_INFRA_I2C1_IMM 72 +#define CLK_INFRA_I2C2_ARBITER 73 +#define CLK_INFRA_I2C2_IMM 74 +#define CLK_INFRA_SPI4 75 +#define CLK_INFRA_SPI5 76 +#define CLK_INFRA_CQ_DMA 77 +#define CLK_INFRA_UFS 78 +#define CLK_INFRA_AES_UFSFDE 79 +#define CLK_INFRA_UFS_TICK 80 +#define CLK_INFRA_MSDC0_SELF 81 +#define CLK_INFRA_MSDC1_SELF 82 +#define CLK_INFRA_MSDC2_SELF 83 +#define CLK_INFRA_SSPM_26M_SELF 84 +#define CLK_INFRA_SSPM_32K_SELF 85 +#define CLK_INFRA_UFS_AXI 86 +#define CLK_INFRA_I2C6 87 +#define CLK_INFRA_AP_MSDC0 88 +#define CLK_INFRA_MD_MSDC0 89 +#define CLK_INFRA_USB 90 +#define CLK_INFRA_DEVMPU_BCLK 91 +#define CLK_INFRA_CCIF2_AP 92 +#define CLK_INFRA_CCIF2_MD 93 +#define CLK_INFRA_CCIF3_AP 94 +#define CLK_INFRA_CCIF3_MD 95 +#define CLK_INFRA_SEJ_F13M 96 +#define CLK_INFRA_AES_BCLK 97 +#define CLK_INFRA_I2C7 98 +#define CLK_INFRA_I2C8 99 +#define CLK_INFRA_FBIST2FPC 100 +#define CLK_INFRA_NR_CLK 101 + +/* MFGCFG */ +#define CLK_MFG_BG3D 0 +#define CLK_MFG_NR_CLK 1 + +/* IMG */ +#define CLK_IMG_OWE 0 +#define CLK_IMG_WPE_B 1 +#define CLK_IMG_WPE_A 2 +#define CLK_IMG_MFB 3 +#define CLK_IMG_RSC 4 +#define CLK_IMG_DPE 5 +#define CLK_IMG_FDVT 6 +#define CLK_IMG_DIP 7 +#define CLK_IMG_LARB2 8 +#define CLK_IMG_LARB5 9 +#define CLK_IMG_NR_CLK 10 + +/* MMSYS_CONFIG */ +#define CLK_MM_SMI_COMMON 0 +#define CLK_MM_SMI_LARB0 1 +#define CLK_MM_SMI_LARB1 2 +#define CLK_MM_GALS_COMM0 3 +#define CLK_MM_GALS_COMM1 4 +#define CLK_MM_GALS_CCU2MM 5 +#define CLK_MM_GALS_IPU12MM 6 +#define CLK_MM_GALS_IMG2MM 7 +#define CLK_MM_GALS_CAM2MM 8 +#define CLK_MM_GALS_IPU2MM 9 +#define CLK_MM_MDP_DL_TXCK 10 +#define CLK_MM_IPU_DL_TXCK 11 +#define CLK_MM_MDP_RDMA0 12 +#define CLK_MM_MDP_RDMA1 13 +#define CLK_MM_MDP_RSZ0 14 +#define CLK_MM_MDP_RSZ1 15 +#define CLK_MM_MDP_TDSHP 16 +#define CLK_MM_MDP_WROT0 17 +#define CLK_MM_FAKE_ENG 18 +#define CLK_MM_DISP_OVL0 19 +#define CLK_MM_DISP_OVL0_2L 20 +#define CLK_MM_DISP_OVL1_2L 21 +#define CLK_MM_DISP_RDMA0 22 +#define CLK_MM_DISP_RDMA1 23 +#define CLK_MM_DISP_WDMA0 24 +#define CLK_MM_DISP_COLOR0 25 +#define CLK_MM_DISP_CCORR0 26 +#define CLK_MM_DISP_AAL0 27 +#define CLK_MM_DISP_GAMMA0 28 +#define CLK_MM_DISP_DITHER0 29 +#define CLK_MM_DISP_SPLIT 30 +#define CLK_MM_DSI0_MM 31 +#define CLK_MM_DSI0_IF 32 +#define CLK_MM_DPI_MM 33 +#define CLK_MM_DPI_IF 34 +#define CLK_MM_FAKE_ENG2 35 +#define CLK_MM_MDP_DL_RX 36 +#define CLK_MM_IPU_DL_RX 37 +#define CLK_MM_26M 38 +#define CLK_MM_MMSYS_R2Y 39 +#define CLK_MM_DISP_RSZ 40 +#define CLK_MM_MDP_WDMA0 41 +#define CLK_MM_MDP_AAL 42 +#define CLK_MM_MDP_CCORR 43 +#define CLK_MM_DBI_MM 44 +#define CLK_MM_DBI_IF 45 +#define CLK_MM_NR_CLK 46 + +/* VDEC_GCON */ +#define CLK_VDEC_VDEC 0 +#define CLK_VDEC_LARB1 1 +#define CLK_VDEC_NR_CLK 2 + +/* VENC_GCON */ +#define CLK_VENC_LARB 0 +#define CLK_VENC_VENC 1 +#define CLK_VENC_JPGENC 2 +#define CLK_VENC_NR_CLK 3 + +/* AUDIO */ +#define CLK_AUDIO_TML 0 +#define CLK_AUDIO_DAC_PREDIS 1 +#define CLK_AUDIO_DAC 2 +#define CLK_AUDIO_ADC 3 +#define CLK_AUDIO_APLL_TUNER 4 +#define CLK_AUDIO_APLL2_TUNER 5 +#define CLK_AUDIO_24M 6 +#define CLK_AUDIO_22M 7 +#define CLK_AUDIO_AFE 8 +#define CLK_AUDIO_I2S4 9 +#define CLK_AUDIO_I2S3 10 +#define CLK_AUDIO_I2S2 11 +#define CLK_AUDIO_I2S1 12 +#define CLK_AUDIO_PDN_ADDA6_ADC 13 +#define CLK_AUDIO_TDM 14 +#define CLK_AUDIO_NR_CLK 15 + +/* IPU_CONN */ +#define CLK_IPU_CONN_IPU 0 +#define CLK_IPU_CONN_AHB 1 +#define CLK_IPU_CONN_AXI 2 +#define CLK_IPU_CONN_ISP 3 +#define CLK_IPU_CONN_CAM_ADL 4 +#define CLK_IPU_CONN_IMG_ADL 5 +#define CLK_IPU_CONN_DAP_RX 6 +#define CLK_IPU_CONN_APB2AXI 7 +#define CLK_IPU_CONN_APB2AHB 8 +#define CLK_IPU_CONN_IPU_CAB1TO2 9 +#define CLK_IPU_CONN_IPU1_CAB1TO2 10 +#define CLK_IPU_CONN_IPU2_CAB1TO2 11 +#define CLK_IPU_CONN_CAB3TO3 12 +#define CLK_IPU_CONN_CAB2TO1 13 +#define CLK_IPU_CONN_CAB3TO1_SLICE 14 +#define CLK_IPU_CONN_NR_CLK 15 + +/* IPU_ADL */ +#define CLK_IPU_ADL_CABGEN 0 +#define CLK_IPU_ADL_NR_CLK 1 + +/* IPU_CORE0 */ +#define CLK_IPU_CORE0_JTAG 0 +#define CLK_IPU_CORE0_AXI 1 +#define CLK_IPU_CORE0_IPU 2 +#define CLK_IPU_CORE0_NR_CLK 3 + +/* IPU_CORE1 */ +#define CLK_IPU_CORE1_JTAG 0 +#define CLK_IPU_CORE1_AXI 1 +#define CLK_IPU_CORE1_IPU 2 +#define CLK_IPU_CORE1_NR_CLK 3 + +/* MCUCFG */ +#define CLK_MCU_MP0_SEL 0 +#define CLK_MCU_MP2_SEL 1 +#define CLK_MCU_BUS_SEL 2 +#define CLK_MCU_NR_CLK 3 + +#endif /* _DT_BINDINGS_CLK_MT8183_H */
Signature · 1 line
2.18.0
PATCH v4 7/12 clk: mediatek: Add flags support for mtk_gate data
In reply to Weiyi LuOn some Mediatek platforms, there are critical clocks of clock gate type.
To register clock gate with flags CLK_IS_CRITICAL,
we need to add the flags field in mtk_gate data and register APIs.
--- drivers/clk/mediatek/clk-gate.c | 5 +++-- drivers/clk/mediatek/clk-gate.h | 3 ++- drivers/clk/mediatek/clk-mtk.c | 3 ++- drivers/clk/mediatek/clk-mtk.h | 1 + 4 files changed, 8 insertions(+), 4 deletions(-)
drivers/clk/mediatek/clk-gate.c +3 -2
@@ -157,7 +157,8 @@ struct clk *mtk_clk_register_gate(int clr_ofs, int sta_ofs, u8 bit, - const struct clk_ops *ops) + const struct clk_ops *ops, + unsigned long flags) { struct mtk_clk_gate *cg;struct clk *clk;
@@ -168,7 +169,7 @@ struct clk *mtk_clk_register_gate(return ERR_PTR (-ENOMEM ); init.name = name; - init.flags =CLK_SET_RATE_PARENT ; + init.flags = flags |CLK_SET_RATE_PARENT ; init.parent_names = parent_name ? &parent_name :NULL ; init.num_parents = parent_name ?1 :0 ; init.ops = ops;
drivers/clk/mediatek/clk-gate.h +2 -1
@@ -47,6 +47,7 @@ struct clk *mtk_clk_register_gate(int clr_ofs, int sta_ofs, u8 bit, - const struct clk_ops *ops); + const struct clk_ops *ops, + unsigned long flags);#endif /* __DRV_CLK_GATE_H */
drivers/clk/mediatek/clk-mtk.c +2 -1
@@ -130,7 +130,8 @@ int mtk_clk_register_gates(struct device_node *node, gate->regs->set_ofs, gate->regs->clr_ofs, gate->regs->sta_ofs, - gate->shift, gate->ops); + gate->shift, gate->ops, + gate->flags);if (IS_ERR (clk)) { pr_err("Failed to register clk %s: %ld\n",
drivers/clk/mediatek/clk-mtk.h +1 -0
@@ -158,6 +158,7 @@ struct mtk_gate {const struct mtk_gate_regs *regs;int shift;const struct clk_ops *ops; +unsigned long flags; }; int mtk_clk_register_gates(struct device_node *node,
Signature · 1 line
2.18.0
PATCH v4 8/12 clk: mediatek: Add MT8183 clock support
In reply to Weiyi LuAdd MT8183 clock support, include topckgen, apmixedsys, infracfg, mcucfg and subsystem clocks.
--- drivers/clk/mediatek/Kconfig | 75 ++ drivers/clk/mediatek/Makefile | 12 + drivers/clk/mediatek/clk-gate.h | 14 + drivers/clk/mediatek/clk-mt8183-audio.c | 105 ++ drivers/clk/mediatek/clk-mt8183-cam.c | 63 + drivers/clk/mediatek/clk-mt8183-img.c | 63 + drivers/clk/mediatek/clk-mt8183-ipu0.c | 56 + drivers/clk/mediatek/clk-mt8183-ipu1.c | 56 + drivers/clk/mediatek/clk-mt8183-ipu_adl.c | 54 + drivers/clk/mediatek/clk-mt8183-ipu_conn.c | 123 ++ drivers/clk/mediatek/clk-mt8183-mfgcfg.c | 54 + drivers/clk/mediatek/clk-mt8183-mm.c | 111 ++ drivers/clk/mediatek/clk-mt8183-vdec.c | 67 + drivers/clk/mediatek/clk-mt8183-venc.c | 59 + drivers/clk/mediatek/clk-mt8183.c | 1285 ++++++++++++++++++++ 15 files changed, 2197 insertions(+) create mode 100644 drivers/clk/mediatek/clk-mt8183-audio.c create mode 100644 drivers/clk/mediatek/clk-mt8183-cam.c create mode 100644 drivers/clk/mediatek/clk-mt8183-img.c create mode 100644 drivers/clk/mediatek/clk-mt8183-ipu0.c create mode 100644 drivers/clk/mediatek/clk-mt8183-ipu1.c create mode 100644 drivers/clk/mediatek/clk-mt8183-ipu_adl.c create mode 100644 drivers/clk/mediatek/clk-mt8183-ipu_conn.c create mode 100644 drivers/clk/mediatek/clk-mt8183-mfgcfg.c create mode 100644 drivers/clk/mediatek/clk-mt8183-mm.c create mode 100644 drivers/clk/mediatek/clk-mt8183-vdec.c create mode 100644 drivers/clk/mediatek/clk-mt8183-venc.c create mode 100644 drivers/clk/mediatek/clk-mt8183.c
drivers/clk/mediatek/Kconfig +75 -0
@@ -216,4 +216,79 @@ config COMMON_CLK_MT8173 default ARCH_MEDIATEK ---help--- This driver supports MediaTek MT8173 clocks. + +config COMMON_CLK_MT8183 + bool "Clock driver for MediaTek MT8183" + depends on (ARCH_MEDIATEK && ARM64) || COMPILE_TEST + select COMMON_CLK_MEDIATEK + default ARCH_MEDIATEK && ARM64 + help + This driver supports MediaTek MT8183 basic clocks. + +config COMMON_CLK_MT8183_AUDIOSYS + bool "Clock driver for MediaTek MT8183 audiosys" + depends on COMMON_CLK_MT8183 + help + This driver supports MediaTek MT8183 audiosys clocks. + +config COMMON_CLK_MT8183_CAMSYS + bool "Clock driver for MediaTek MT8183 camsys" + depends on COMMON_CLK_MT8183 + help + This driver supports MediaTek MT8183 camsys clocks. + +config COMMON_CLK_MT8183_IMGSYS + bool "Clock driver for MediaTek MT8183 imgsys" + depends on COMMON_CLK_MT8183 + help + This driver supports MediaTek MT8183 imgsys clocks. + +config COMMON_CLK_MT8183_IPU_CORE0 + bool "Clock driver for MediaTek MT8183 ipu_core0" + depends on COMMON_CLK_MT8183 + help + This driver supports MediaTek MT8183 ipu_core0 clocks. + +config COMMON_CLK_MT8183_IPU_CORE1 + bool "Clock driver for MediaTek MT8183 ipu_core1" + depends on COMMON_CLK_MT8183 + help + This driver supports MediaTek MT8183 ipu_core1 clocks. + +config COMMON_CLK_MT8183_IPU_ADL + bool "Clock driver for MediaTek MT8183 ipu_adl" + depends on COMMON_CLK_MT8183 + help + This driver supports MediaTek MT8183 ipu_adl clocks. + +config COMMON_CLK_MT8183_IPU_CONN + bool "Clock driver for MediaTek MT8183 ipu_conn" + depends on COMMON_CLK_MT8183 + help + This driver supports MediaTek MT8183 ipu_conn clocks. + +config COMMON_CLK_MT8183_MFGCFG + bool "Clock driver for MediaTek MT8183 mfgcfg" + depends on COMMON_CLK_MT8183 + help + This driver supports MediaTek MT8183 mfgcfg clocks. + +config COMMON_CLK_MT8183_MMSYS + bool "Clock driver for MediaTek MT8183 mmsys" + depends on COMMON_CLK_MT8183 + help + This driver supports MediaTek MT8183 mmsys clocks. + +config COMMON_CLK_MT8183_VDECSYS + bool "Clock driver for MediaTek MT8183 vdecsys" + depends on COMMON_CLK_MT8183 + help + This driver supports MediaTek MT8183 vdecsys clocks. + +config COMMON_CLK_MT8183_VENCSYS + bool "Clock driver for MediaTek MT8183 vencsys" + depends on COMMON_CLK_MT8183 + help + This driver supports MediaTek MT8183 vencsys clocks. + endmenu
drivers/clk/mediatek/Makefile +12 -0
@@ -32,3 +32,15 @@ obj-$(CONFIG_COMMON_CLK_MT7629_ETHSYS) += clk-mt7629-eth.o obj-$(CONFIG_COMMON_CLK_MT7629_HIFSYS) += clk-mt7629-hif.o obj-$(CONFIG_COMMON_CLK_MT8135) += clk-mt8135.o obj-$(CONFIG_COMMON_CLK_MT8173) += clk-mt8173.o +obj-$(CONFIG_COMMON_CLK_MT8183) += clk-mt8183.o +obj-$(CONFIG_COMMON_CLK_MT8183_AUDIOSYS) += clk-mt8183-audio.o +obj-$(CONFIG_COMMON_CLK_MT8183_CAMSYS) += clk-mt8183-cam.o +obj-$(CONFIG_COMMON_CLK_MT8183_IMGSYS) += clk-mt8183-img.o +obj-$(CONFIG_COMMON_CLK_MT8183_IPU_CORE0) += clk-mt8183-ipu0.o +obj-$(CONFIG_COMMON_CLK_MT8183_IPU_CORE1) += clk-mt8183-ipu1.o +obj-$(CONFIG_COMMON_CLK_MT8183_IPU_ADL) += clk-mt8183-ipu_adl.o +obj-$(CONFIG_COMMON_CLK_MT8183_IPU_CONN) += clk-mt8183-ipu_conn.o +obj-$(CONFIG_COMMON_CLK_MT8183_MFGCFG) += clk-mt8183-mfgcfg.o +obj-$(CONFIG_COMMON_CLK_MT8183_MMSYS) += clk-mt8183-mm.o +obj-$(CONFIG_COMMON_CLK_MT8183_VDECSYS) += clk-mt8183-vdec.o +obj-$(CONFIG_COMMON_CLK_MT8183_VENCSYS) += clk-mt8183-venc.o
drivers/clk/mediatek/clk-gate.h +14 -0
@@ -50,4 +50,18 @@ struct clk *mtk_clk_register_gate(const struct clk_ops *ops, unsigned long flags); +#define GATE_MTK_FLAGS (_id, _name, _parent, _regs, _shift, \ + _ops, _flags) { \ + .id = _id, \ + .name = _name, \ + .parent_name = _parent, \ + .regs = _regs, \ + .shift = _shift, \ + .ops = _ops, \ + .flags = _flags, \ + } + +#define GATE_MTK (_id, _name, _parent, _regs, _shift, _ops) \ + GATE_MTK_FLAGS(_id, _name, _parent, _regs, _shift, _ops, 0) +#endif /* __DRV_CLK_GATE_H */
drivers/clk/mediatek/clk-mt8183-audio.c new file +105 -0
105 lines not on this page · raw message
drivers/clk/mediatek/clk-mt8183-cam.c new file +63 -0
63 lines not on this page · raw message
drivers/clk/mediatek/clk-mt8183-img.c new file +63 -0
63 lines not on this page · raw message
drivers/clk/mediatek/clk-mt8183-ipu0.c new file +56 -0
56 lines not on this page · raw message
drivers/clk/mediatek/clk-mt8183-ipu1.c new file +56 -0
56 lines not on this page · raw message
drivers/clk/mediatek/clk-mt8183-ipu_adl.c new file +54 -0
54 lines not on this page · raw message
drivers/clk/mediatek/clk-mt8183-ipu_conn.c new file +123 -0
123 lines not on this page · raw message
drivers/clk/mediatek/clk-mt8183-mfgcfg.c new file +54 -0
54 lines not on this page · raw message
drivers/clk/mediatek/clk-mt8183-mm.c new file +111 -0
111 lines not on this page · raw message
drivers/clk/mediatek/clk-mt8183-vdec.c new file +67 -0
67 lines not on this page · raw message
drivers/clk/mediatek/clk-mt8183-venc.c new file +59 -0
59 lines not on this page · raw message
drivers/clk/mediatek/clk-mt8183.c new file +1285 -0
1,285 lines not on this page · raw message
Signature · 1 line
2.18.0
Stephen Boyd
maintainerRe: [PATCH v4 08/12] clk: mediatek: Add MT8183 clock support
Quoting Weiyi Lu (2019-02-01 00:30:12)
Quoted 19 lines
drivers/clk/mediatek/clk-mt8183.c new file +13
-0@@ -0,0 +1,1285 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (c) 2018 MediaTek Inc. +// Author: Weiyi Lu <[email protected]> + +#include <linux/delay.h> +#include <linux/mfd/syscon.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/of_device.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +
[....]
drivers/clk/mediatek/clk-mt8183.c line 1176
Quoted 11 lines
drivers/clk/mediatek/clk-mt8183.c new file +11
-0+ +static int clk_mt8183_top_probe (struct platform_device *pdev) +{ +struct resource *res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +void __iomem *base; +struct clk_onecell_data *clk_data; +struct device_node *node = pdev->dev.of_node; + + base =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (base)) { +pr_err ("%s(): ioremap failed\n" , __func__);
This API already prints an error so please remove this duplicate error message
Quoted 42 lines
drivers/clk/mediatek/clk-mt8183.c new file +42
-0+return PTR_ERR (base); + } + + clk_data =mtk_alloc_clk_data (CLK_TOP_NR_CLK ); + +mtk_clk_register_fixed_clks (top_fixed_clks,ARRAY_SIZE (top_fixed_clks), + clk_data); + +mtk_clk_register_factors (top_divs,ARRAY_SIZE (top_divs), clk_data); + +mtk_clk_register_muxes (top_muxes,ARRAY_SIZE (top_muxes), + node, &mt8183_clk_lock, clk_data); + +mtk_clk_register_composites (top_aud_muxes,ARRAY_SIZE (top_aud_muxes), + base, &mt8183_clk_lock, clk_data); + +mtk_clk_register_composites (top_aud_divs,ARRAY_SIZE (top_aud_divs), + base, &mt8183_clk_lock, clk_data); + +mtk_clk_register_gates (node, top_clks,ARRAY_SIZE (top_clks), + clk_data); + +return of_clk_add_provider (node, of_clk_src_onecell_get, clk_data); +} + +static int clk_mt8183_infra_probe (struct platform_device *pdev) +{ +struct clk_onecell_data *clk_data; +struct device_node *node = pdev->dev.of_node; + + clk_data =mtk_alloc_clk_data (CLK_INFRA_NR_CLK ); + +mtk_clk_register_gates (node, infra_clks,ARRAY_SIZE (infra_clks), + clk_data); + +return of_clk_add_provider (node, of_clk_src_onecell_get, clk_data); +} + +static int clk_mt8183_mcu_probe (struct platform_device *pdev) +{ +struct clk_onecell_data *clk_data; +struct device_node *node = pdev->dev.of_node;
drivers/clk/mediatek/clk-mt8183.c line 1228
Quoted 10 lines
drivers/clk/mediatek/clk-mt8183.c new file +10
-0+void __iomem *base; +struct resource *res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + + base =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (base)) { +pr_err ("%s(): ioremap failed\n" , __func__); +return PTR_ERR (base); + } + + clk_data =mtk_alloc_clk_data (CLK_MCU_NR_CLK );
Can this fail? It doesn't seem to be checked for failure so I guess we don't care?
Quoted 7 lines
drivers/clk/mediatek/clk-mt8183.c new file +7
-0+ +mtk_clk_register_composites (mcu_muxes,ARRAY_SIZE (mcu_muxes), base, + &mt8183_clk_lock, clk_data); + +return of_clk_add_provider (node, of_clk_src_onecell_get, clk_data); +} +
Re: [PATCH v4 08/12] clk: mediatek: Add MT8183 clock support
Quoted 21 lines · Stephen Boyd
Quoting Weiyi Lu (2019-02-01 00:30:12)
Quoted 19 lines
drivers/clk/mediatek/clk-mt8183.c new file +13
-0@@ -0,0 +1,1285 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (c) 2018 MediaTek Inc. +// Author: Weiyi Lu <[email protected]> + +#include <linux/delay.h> +#include <linux/mfd/syscon.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/of_device.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +[....]
Quoted 15 lines
drivers/clk/mediatek/clk-mt8183.c line 1176
Quoted 11 lines
drivers/clk/mediatek/clk-mt8183.c new file +11
-0+ +static int clk_mt8183_top_probe (struct platform_device *pdev) +{ +struct resource *res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +void __iomem *base; +struct clk_onecell_data *clk_data; +struct device_node *node = pdev->dev.of_node; + + base =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (base)) { +pr_err ("%s(): ioremap failed\n" , __func__);This API already prints an error so please remove this duplicate error message
ok, I'll remove those duplicate error message in next version.
Quoted 47 lines
Quoted 47 lines
drivers/clk/mediatek/clk-mt8183.c new file +47
-0+return PTR_ERR (base); + } + + clk_data =mtk_alloc_clk_data (CLK_TOP_NR_CLK ); + +mtk_clk_register_fixed_clks (top_fixed_clks,ARRAY_SIZE (top_fixed_clks), + clk_data); + +mtk_clk_register_factors (top_divs,ARRAY_SIZE (top_divs), clk_data); + +mtk_clk_register_muxes (top_muxes,ARRAY_SIZE (top_muxes), + node, &mt8183_clk_lock, clk_data); + +mtk_clk_register_composites (top_aud_muxes,ARRAY_SIZE (top_aud_muxes), + base, &mt8183_clk_lock, clk_data); + +mtk_clk_register_composites (top_aud_divs,ARRAY_SIZE (top_aud_divs), + base, &mt8183_clk_lock, clk_data); + +mtk_clk_register_gates (node, top_clks,ARRAY_SIZE (top_clks), + clk_data); + +return of_clk_add_provider (node, of_clk_src_onecell_get, clk_data); +} + +static int clk_mt8183_infra_probe (struct platform_device *pdev) +{ +struct clk_onecell_data *clk_data; +struct device_node *node = pdev->dev.of_node; + + clk_data =mtk_alloc_clk_data (CLK_INFRA_NR_CLK ); + +mtk_clk_register_gates (node, infra_clks,ARRAY_SIZE (infra_clks), + clk_data); + +return of_clk_add_provider (node, of_clk_src_onecell_get, clk_data); +} + +static int clk_mt8183_mcu_probe (struct platform_device *pdev) +{ +struct clk_onecell_data *clk_data; +struct device_node *node = pdev->dev.of_node; +void __iomem *base; +struct resource *res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + + base =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (base)) {
Quoted 9 lines
drivers/clk/mediatek/clk-mt8183.c line 1228
Quoted 5 lines
drivers/clk/mediatek/clk-mt8183.c new file +5
-0+pr_err ("%s(): ioremap failed\n" , __func__); +return PTR_ERR (base); + } + + clk_data =mtk_alloc_clk_data (CLK_MCU_NR_CLK );Can this fail? It doesn't seem to be checked for failure so I guess we don't care?
It might fail but we have data validity checks in all the mtk_clk_register APIs.
Quoted 12 lines
drivers/clk/mediatek/clk-mt8183.c line 1235
Quoted 7 lines
drivers/clk/mediatek/clk-mt8183.c new file +7
-0+ +mtk_clk_register_composites (mcu_muxes,ARRAY_SIZE (mcu_muxes), base, + &mt8183_clk_lock, clk_data); + +return of_clk_add_provider (node, of_clk_src_onecell_get, clk_data); +} +_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v4 9/12 dt-bindings: soc: fix typo of MT8173 power dt-bindings
In reply to Weiyi Lufix incorrect IC name that will affect the MT8183 power dt-bindings
--- include/dt-bindings/power/mt8173-power.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/dt-bindings/power/mt8173-power.h +3 -3
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _DT_BINDINGS_POWER_MT8183_POWER_H -#define _DT_BINDINGS_POWER_MT8183_POWER_H +#ifndef _DT_BINDINGS_POWER_MT8173_POWER_H +#define _DT_BINDINGS_POWER_MT8173_POWER_H#define MT8173_POWER_DOMAIN_VDEC 0#define MT8173_POWER_DOMAIN_VENC 1
@@ -13,4 +13,4 @@#define MT8173_POWER_DOMAIN_MFG_2D 8#define MT8173_POWER_DOMAIN_MFG 9 -#endif /* _DT_BINDINGS_POWER_MT8183_POWER_H */ +#endif /* _DT_BINDINGS_POWER_MT8173_POWER_H */
Signature · 1 line
2.18.0
Re: [PATCH v4 09/12] dt-bindings: soc: fix typo of MT8173 power dt-bindings
Quoted 4 lines · Weiyi Lu
fix incorrect IC name that will affect the MT8183 power dt-bindings
Signed-off-by Weiyi Lu <[email protected]>---
pushed to v5.0-next/soc
Thanks
Quoted 23 lines
include/dt-bindings/power/mt8173-power.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)include/dt-bindings/power/mt8173-power.h +3
-3@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _DT_BINDINGS_POWER_MT8183_POWER_H -#define _DT_BINDINGS_POWER_MT8183_POWER_H +#ifndef _DT_BINDINGS_POWER_MT8173_POWER_H +#define _DT_BINDINGS_POWER_MT8173_POWER_H#define MT8173_POWER_DOMAIN_VDEC 0#define MT8173_POWER_DOMAIN_VENC 1@@ -13,4 +13,4 @@#define MT8173_POWER_DOMAIN_MFG_2D 8#define MT8173_POWER_DOMAIN_MFG 9 -#endif /* _DT_BINDINGS_POWER_MT8183_POWER_H */ +#endif /* _DT_BINDINGS_POWER_MT8173_POWER_H */
PATCH v4 10/12 dt-bindings: soc: Add MT8183 power dt-bindings
In reply to Weiyi LuAdd power dt-bindings for MT8183.
--- .../bindings/soc/mediatek/scpsys.txt | 14 ++++++++++ include/dt-bindings/power/mt8183-power.h | 26 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 include/dt-bindings/power/mt8183-power.h
Documentation/devicetree/bindings/soc/mediatek/scpsys.txt +14 -0
@@ -14,6 +14,7 @@ power/power_domain.txt. It provides the power domains defined in - include/dt-bindings/power/mt2701-power.h - include/dt-bindings/power/mt2712-power.h - include/dt-bindings/power/mt7622-power.h +- include/dt-bindings/power/mt8183-power.h Required properties: - compatible: Should be one of:
@@ -24,18 +25,31 @@ Required properties: - "mediatek,mt7623-scpsys", "mediatek,mt2701-scpsys": For MT7623 SoC - "mediatek,mt7623a-scpsys": For MT7623A SoC - "mediatek,mt8173-scpsys" + - "mediatek,mt8183-scpsys" - #power-domain-cells: Must be 1 - reg: Address range of the SCPSYS unit - infracfg: must contain a phandle to the infracfg controller - clock, clock-names: clocks according to the common clock binding. These are clocks which hardware needs to be enabled before enabling certain power domains. + The new clock type "BASIC" belongs to the type above. + As to the new clock type "SUBSYS" needs to be + enabled before releasing bus protection. Required clocks for MT2701 or MT7623: "mm", "mfg", "ethif" Required clocks for MT2712: "mm", "mfg", "venc", "jpgdec", "audio", "vdec" Required clocks for MT6797: "mm", "mfg", "vdec" Required clocks for MT7622: "hif_sel" Required clocks for MT7622A: "ethif" Required clocks for MT8173: "mm", "mfg", "venc", "venc_lt" + Required clocks for MT8183: BASIC: "audio", "mfg", "mm", "cam", "isp", + "vpu", "vpu1", "vpu2", "vpu3" + SUBSYS: "mm-0", "mm-1", "mm-2", "mm-3", + "mm-4", "mm-5", "mm-6", "mm-7", + "mm-8", "mm-9", "isp-0", "isp-1", + "cam-0", "cam-1", "cam-2", "cam-3", + "cam-4", "cam-5", "cam-6", "vpu-0", + "vpu-1", "vpu-2", "vpu-3", "vpu-4", + "vpu-5" Optional properties: - vdec-supply: Power supply for the vdec power domain
include/dt-bindings/power/mt8183-power.h new file +26 -0
@@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0 +* +* Copyright (c) 2018 MediaTek Inc. +* Author: Weiyi Lu <[email protected]> +*/ + +#ifndef _DT_BINDINGS_POWER_MT8183_POWER_H +#define _DT_BINDINGS_POWER_MT8183_POWER_H + +#define MT8183_POWER_DOMAIN_AUDIO 0 +#define MT8183_POWER_DOMAIN_CONN 1 +#define MT8183_POWER_DOMAIN_MFG_ASYNC 2 +#define MT8183_POWER_DOMAIN_MFG 3 +#define MT8183_POWER_DOMAIN_MFG_CORE0 4 +#define MT8183_POWER_DOMAIN_MFG_CORE1 5 +#define MT8183_POWER_DOMAIN_MFG_2D 6 +#define MT8183_POWER_DOMAIN_DISP 7 +#define MT8183_POWER_DOMAIN_CAM 8 +#define MT8183_POWER_DOMAIN_ISP 9 +#define MT8183_POWER_DOMAIN_VDEC 10 +#define MT8183_POWER_DOMAIN_VENC 11 +#define MT8183_POWER_DOMAIN_VPU_TOP 12 +#define MT8183_POWER_DOMAIN_VPU_CORE0 13 +#define MT8183_POWER_DOMAIN_VPU_CORE1 14 + +#endif /* _DT_BINDINGS_POWER_MT8183_POWER_H */
Signature · 1 line
2.18.0
Matthias Brugger
maintainerRe: [PATCH v4 10/12] dt-bindings: soc: Add MT8183 power dt-bindings
Quoted 2 lines · Weiyi Lu
Add power dt-bindings for MT8183.
Sorry didn't see this when reviewing the driver. Please add real commit message, explaining what the changes are.
Quoted 84 lines
Signed-off-by Weiyi Lu <[email protected]>--- .../bindings/soc/mediatek/scpsys.txt | 14 ++++++++++ include/dt-bindings/power/mt8183-power.h | 26 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 include/dt-bindings/power/mt8183-power.hDocumentation/devicetree/bindings/soc/mediatek/scpsys.txt +14
-0@@ -14,6 +14,7 @@ power/power_domain.txt. It provides the power domains defined in - include/dt-bindings/power/mt2701-power.h - include/dt-bindings/power/mt2712-power.h - include/dt-bindings/power/mt7622-power.h +- include/dt-bindings/power/mt8183-power.h Required properties: - compatible: Should be one of:@@ -24,18 +25,31 @@ Required properties: - "mediatek,mt7623-scpsys", "mediatek,mt2701-scpsys": For MT7623 SoC - "mediatek,mt7623a-scpsys": For MT7623A SoC - "mediatek,mt8173-scpsys" + - "mediatek,mt8183-scpsys" - #power-domain-cells: Must be 1 - reg: Address range of the SCPSYS unit - infracfg: must contain a phandle to the infracfg controller - clock, clock-names: clocks according to the common clock binding. These are clocks which hardware needs to be enabled before enabling certain power domains. + The new clock type "BASIC" belongs to the type above. + As to the new clock type "SUBSYS" needs to be + enabled before releasing bus protection. Required clocks for MT2701 or MT7623: "mm", "mfg", "ethif" Required clocks for MT2712: "mm", "mfg", "venc", "jpgdec", "audio", "vdec" Required clocks for MT6797: "mm", "mfg", "vdec" Required clocks for MT7622: "hif_sel" Required clocks for MT7622A: "ethif" Required clocks for MT8173: "mm", "mfg", "venc", "venc_lt" + Required clocks for MT8183: BASIC: "audio", "mfg", "mm", "cam", "isp", + "vpu", "vpu1", "vpu2", "vpu3" + SUBSYS: "mm-0", "mm-1", "mm-2", "mm-3", + "mm-4", "mm-5", "mm-6", "mm-7", + "mm-8", "mm-9", "isp-0", "isp-1", + "cam-0", "cam-1", "cam-2", "cam-3", + "cam-4", "cam-5", "cam-6", "vpu-0", + "vpu-1", "vpu-2", "vpu-3", "vpu-4", + "vpu-5" Optional properties: - vdec-supply: Power supply for the vdec power domaininclude/dt-bindings/power/mt8183-power.h new file +26
-0@@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0 +* +* Copyright (c) 2018 MediaTek Inc. +* Author: Weiyi Lu <[email protected]> +*/ + +#ifndef _DT_BINDINGS_POWER_MT8183_POWER_H +#define _DT_BINDINGS_POWER_MT8183_POWER_H + +#define MT8183_POWER_DOMAIN_AUDIO 0 +#define MT8183_POWER_DOMAIN_CONN 1 +#define MT8183_POWER_DOMAIN_MFG_ASYNC 2 +#define MT8183_POWER_DOMAIN_MFG 3 +#define MT8183_POWER_DOMAIN_MFG_CORE0 4 +#define MT8183_POWER_DOMAIN_MFG_CORE1 5 +#define MT8183_POWER_DOMAIN_MFG_2D 6 +#define MT8183_POWER_DOMAIN_DISP 7 +#define MT8183_POWER_DOMAIN_CAM 8 +#define MT8183_POWER_DOMAIN_ISP 9 +#define MT8183_POWER_DOMAIN_VDEC 10 +#define MT8183_POWER_DOMAIN_VENC 11 +#define MT8183_POWER_DOMAIN_VPU_TOP 12 +#define MT8183_POWER_DOMAIN_VPU_CORE0 13 +#define MT8183_POWER_DOMAIN_VPU_CORE1 14 + +#endif /* _DT_BINDINGS_POWER_MT8183_POWER_H */
PATCH v4 11/12 soc: mediatek: Add MT8183 scpsys support
In reply to Weiyi LuAdd scpsys driver for MT8183
--- drivers/soc/mediatek/mtk-scpsys.c | 226 ++++++++++++++++++++++++++++++ 1 file changed, 226 insertions(+)
drivers/soc/mediatek/mtk-scpsys.c +226 -0
@@ -20,6 +20,7 @@#include <dt-bindings/power/mt7622-power.h> #include <dt-bindings/power/mt7623a-power.h> #include <dt-bindings/power/mt8173-power.h> +#include <dt-bindings/power/mt8183-power.h> #define MTK_POLL_DELAY_US 10#define MTK_POLL_TIMEOUT USEC_PER_SEC
@@ -1142,6 +1143,217 @@ static const struct scp_subdomain scp_subdomain_mt8173[] = { {MT8173_POWER_DOMAIN_MFG_2D, MT8173_POWER_DOMAIN_MFG}, }; +/* +* MT8183 power domain support +*/ + +static const struct scp_domain_data scp_domain_data_mt8183[] = { + [MT8183_POWER_DOMAIN_AUDIO ] = { + .name ="audio" , + .sta_mask =PWR_STATUS_AUDIO , + .ctl_offs =0x0314 , + .sram_pdn_bits =GENMASK (11 ,8 ), + .sram_pdn_ack_bits =GENMASK (15 ,12 ), + .basic_clk_name = {"audio" ,"audio1" ,"audio2" }, + }, + [MT8183_POWER_DOMAIN_CONN ] = { + .name ="conn" , + .sta_mask =PWR_STATUS_CONN , + .ctl_offs =0x032c , + .sram_pdn_bits =0 , + .sram_pdn_ack_bits =0 , + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2a0 ,0x2a4 ,0 ,0x228 , +BIT (13 ) |BIT (14 ),BIT (13 ) |BIT (14 )), + }, + }, + [MT8183_POWER_DOMAIN_MFG_ASYNC ] = { + .name ="mfg_async" , + .sta_mask =PWR_STATUS_MFG_ASYNC , + .ctl_offs =0x0334 , + .sram_pdn_bits =0 , + .sram_pdn_ack_bits =0 , + .basic_clk_name = {"mfg" }, + }, + [MT8183_POWER_DOMAIN_MFG ] = { + .name ="mfg" , + .sta_mask =PWR_STATUS_MFG , + .ctl_offs =0x0338 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + }, + [MT8183_POWER_DOMAIN_MFG_CORE0 ] = { + .name ="mfg_core0" , + .sta_mask =BIT (7 ), + .ctl_offs =0x034c , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + }, + [MT8183_POWER_DOMAIN_MFG_CORE1 ] = { + .name ="mfg_core1" , + .sta_mask =BIT (20 ), + .ctl_offs =0x0310 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + }, + [MT8183_POWER_DOMAIN_MFG_2D ] = { + .name ="mfg_2d" , + .sta_mask =PWR_STATUS_MFG_2D , + .ctl_offs =0x0348 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2a8 ,0x2ac ,0 ,0x258 , +BIT (19 ) |BIT (20 ) |BIT (21 ), +BIT (19 ) |BIT (20 ) |BIT (21 )), +BUS_PROT (IFR_TYPE ,0x2a0 ,0x2a4 ,0 ,0x228 , +BIT (21 ) |BIT (22 ),BIT (21 ) |BIT (22 )), + }, + }, + [MT8183_POWER_DOMAIN_DISP ] = { + .name ="disp" , + .sta_mask =PWR_STATUS_DISP , + .ctl_offs =0x030c , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .basic_clk_name = {"mm" }, + .subsys_clk_prefix ="mm" , + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2a8 ,0x2ac ,0 ,0x258 , +BIT (16 ) |BIT (17 ),BIT (16 ) |BIT (17 )), +BUS_PROT (IFR_TYPE ,0x2a0 ,0x2a4 ,0 ,0x228 , +BIT (10 ) |BIT (11 ),BIT (10 ) |BIT (11 )), +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +GENMASK (7 ,0 ),GENMASK (7 ,0 )), + }, + }, + [MT8183_POWER_DOMAIN_CAM ] = { + .name ="cam" , + .sta_mask =BIT (25 ), + .ctl_offs =0x0344 , + .sram_pdn_bits =GENMASK (9 ,8 ), + .sram_pdn_ack_bits =GENMASK (13 ,12 ), + .basic_clk_name = {"cam" }, + .subsys_clk_prefix ="cam" , + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +BIT (4 ) |BIT (5 ) |BIT (9 ) |BIT (13 ), +BIT (4 ) |BIT (5 ) |BIT (9 ) |BIT (13 )), +BUS_PROT (IFR_TYPE ,0x2a0 ,0x2a4 ,0 ,0x228 , +BIT (28 ),BIT (28 )), +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +BIT (11 ),0 ), +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +BIT (3 ) |BIT (4 ),BIT (3 ) |BIT (4 )), + }, + }, + [MT8183_POWER_DOMAIN_ISP ] = { + .name ="isp" , + .sta_mask =PWR_STATUS_ISP , + .ctl_offs =0x0308 , + .sram_pdn_bits =GENMASK (9 ,8 ), + .sram_pdn_ack_bits =GENMASK (13 ,12 ), + .basic_clk_name = {"isp" }, + .subsys_clk_prefix ="isp" , + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +BIT (3 ) |BIT (8 ),BIT (3 ) |BIT (8 )), +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +BIT (10 ),0 ), +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +BIT (2 ),BIT (2 )), + }, + }, + [MT8183_POWER_DOMAIN_VDEC ] = { + .name ="vdec" , + .sta_mask =BIT (31 ), + .ctl_offs =0x0300 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_table = { +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +BIT (7 ),BIT (7 )), + }, + }, + [MT8183_POWER_DOMAIN_VENC ] = { + .name ="venc" , + .sta_mask =PWR_STATUS_VENC , + .ctl_offs =0x0304 , + .sram_pdn_bits =GENMASK (11 ,8 ), + .sram_pdn_ack_bits =GENMASK (15 ,12 ), + .bp_table = { +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +BIT (1 ),BIT (1 )), + }, + }, + [MT8183_POWER_DOMAIN_VPU_TOP ] = { + .name ="vpu_top" , + .sta_mask =BIT (26 ), + .ctl_offs =0x0324 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .basic_clk_name = {"vpu" ,"vpu1" }, + .subsys_clk_prefix ="vpu" , + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +GENMASK (9 ,6 ) |BIT (12 ), +GENMASK (9 ,6 ) |BIT (12 )), +BUS_PROT (IFR_TYPE ,0x2a0 ,0x2a4 ,0 ,0x228 , +BIT (27 ),BIT (27 )), +BUS_PROT (IFR_TYPE ,0x2d4 ,0x2d8 ,0 ,0x2ec , +BIT (10 ) |BIT (11 ),BIT (10 ) |BIT (11 )), +BUS_PROT (SMI_TYPE ,0x3c4 ,0x3c8 ,0 ,0x3c0 , +BIT (5 ) |BIT (6 ),BIT (5 ) |BIT (6 )), + }, + }, + [MT8183_POWER_DOMAIN_VPU_CORE0 ] = { + .name ="vpu_core0" , + .sta_mask =BIT (27 ), + .ctl_offs =0x33c , + .sram_iso_ctrl = true, + .sram_pdn_bits =GENMASK (11 ,8 ), + .sram_pdn_ack_bits =GENMASK (13 ,12 ), + .basic_clk_name = {"vpu2" }, + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2c4 ,0x2c8 ,0 ,0x2e4 , +BIT (6 ),BIT (6 )), +BUS_PROT (IFR_TYPE ,0x2c4 ,0x2c8 ,0 ,0x2e4 , +BIT (0 ) |BIT (2 ) |BIT (4 ), +BIT (0 ) |BIT (2 ) |BIT (4 )), + }, + }, + [MT8183_POWER_DOMAIN_VPU_CORE1 ] = { + .name ="vpu_core1" , + .sta_mask =BIT (28 ), + .ctl_offs =0x0340 , + .sram_iso_ctrl = true, + .sram_pdn_bits =GENMASK (11 ,8 ), + .sram_pdn_ack_bits =GENMASK (13 ,12 ), + .basic_clk_name = {"vpu3" }, + .bp_table = { +BUS_PROT (IFR_TYPE ,0x2c4 ,0x2c8 ,0 ,0x2e4 , +BIT (7 ),BIT (7 )), +BUS_PROT (IFR_TYPE ,0x2c4 ,0x2c8 ,0 ,0x2e4 , +BIT (1 ) |BIT (3 ) |BIT (5 ), +BIT (1 ) |BIT (3 ) |BIT (5 )), + }, + }, +}; + +static const struct scp_subdomain scp_subdomain_mt8183[] = { + {MT8183_POWER_DOMAIN_MFG_ASYNC ,MT8183_POWER_DOMAIN_MFG }, + {MT8183_POWER_DOMAIN_MFG ,MT8183_POWER_DOMAIN_MFG_2D }, + {MT8183_POWER_DOMAIN_MFG ,MT8183_POWER_DOMAIN_MFG_CORE0 }, + {MT8183_POWER_DOMAIN_MFG ,MT8183_POWER_DOMAIN_MFG_CORE1 }, + {MT8183_POWER_DOMAIN_DISP ,MT8183_POWER_DOMAIN_CAM }, + {MT8183_POWER_DOMAIN_DISP ,MT8183_POWER_DOMAIN_ISP }, + {MT8183_POWER_DOMAIN_DISP ,MT8183_POWER_DOMAIN_VDEC }, + {MT8183_POWER_DOMAIN_DISP ,MT8183_POWER_DOMAIN_VENC }, + {MT8183_POWER_DOMAIN_DISP ,MT8183_POWER_DOMAIN_VPU_TOP }, + {MT8183_POWER_DOMAIN_VPU_TOP ,MT8183_POWER_DOMAIN_VPU_CORE0 }, + {MT8183_POWER_DOMAIN_VPU_TOP ,MT8183_POWER_DOMAIN_VPU_CORE1 }, +}; +static const struct scp_soc_data mt2701_data = { .domains = scp_domain_data_mt2701, .num_domains = ARRAY_SIZE(scp_domain_data_mt2701),
@@ -1208,6 +1420,17 @@ static const struct scp_soc_data mt8173_data = { .bus_prot_reg_update = true, }; +static const struct scp_soc_data mt8183_data = { + .domains = scp_domain_data_mt8183, + .num_domains =ARRAY_SIZE (scp_domain_data_mt8183), + .subdomains = scp_subdomain_mt8183, + .num_subdomains =ARRAY_SIZE (scp_subdomain_mt8183), + .regs = { + .pwr_sta_offs =0x0180 , + .pwr_sta2nd_offs =0x0184 + } +}; +/* * scpsys driver init */
@@ -1231,6 +1454,9 @@ static const struct of_device_id of_scpsys_match_tbl[] = { }, { .compatible = "mediatek,mt8173-scpsys", .data = &mt8173_data, + }, { + .compatible = "mediatek,mt8183-scpsys", + .data = &mt8183_data, }, { /* sentinel */ }
Signature · 1 line
2.18.0
PATCH v4 12/12 clk: mediatek: Allow changing PLL rate when it is off
In reply to Weiyi LuFrom: James Liao <[email protected]>
Some modules may need to change its clock rate before turn on it. So changing PLL's rate when it is off should be allowed. This patch removes PLL enabled check before set rate, so that PLLs can set new frequency even if they are off.
On MT8173 for example, ARMPLL's enable bit can be controlled by other HW. That means ARMPLL may be turned on even if we (CPU / SW) set ARMPLL's enable bit as 0. In this case, SW may want and can still change ARMPLL's rate by changing its pcw and postdiv settings. But without this patch, new pcw setting will not be applied because its enable bit is 0.
--- drivers/clk/mediatek/clk-pll.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/clk/mediatek/clk-pll.c +2 -7
@@ -97,13 +97,10 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, int postdiv) {u32 con1, val; -int pll_en;u32 tuner_en =0 ;u32 tuner_en_mask;void __iomem *tuner_en_addr =NULL ; - pll_en =readl (pll->base_addr +REG_CON0 ) &CON0_BASE_EN ; -/* disable tuner */ if (pll->tuner_en_addr) { tuner_en_addr = pll->tuner_en_addr;
@@ -142,8 +139,7 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, con1 =readl (pll->base_addr +REG_CON1 ); -if (pll_en) - con1 |=CON1_PCW_CHG ; + con1 |=CON1_PCW_CHG ;writel (con1, pll->base_addr +REG_CON1 );if (pll->tuner_addr)
@@ -156,8 +152,7 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw,writel (val, tuner_en_addr); } -if (pll_en) -udelay (20 ); +udelay (20 ); }/*
Signature · 1 line
2.18.0