* [PATCH v3 0/3] meson-gx: Add mali-450 support
@ 2017-03-09 12:53 Neil Armstrong
2017-03-09 12:53 ` [PATCH v3 1/3] clk: meson-gxbb: Add MALI clock IDS Neil Armstrong
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Neil Armstrong @ 2017-03-09 12:53 UTC (permalink / raw)
To: sboyd, khilman, carlo
Cc: Neil Armstrong, linux-amlogic, linux-clk, linux-arm-kernel, linux-kernel
Since the merge of the Mali dt bindings at [1], add support for Mali clocks
and DT node.
The Mali is clocked by two identical clock paths behind a glitch free mux
to safely change frequency while running.
So these clocks must be added to the meson-gxbb clock controller.
Changes since v2 at [5] :
- Rebased on v2 Audio Clocks patchset from Jerome Brunet at [6]
- Marked parents names list as static
- Reworded patch 3 commit message
Changes since v1 at [2] :
- Remove GP0 fixes, this will pushed later, for base frequency it can depend on fclk_div3
- Add GXL support
- rebase on clk-next and jbrunet's patchset at [3] and [4]
- get rid of composite clocks, this adds more clocks IDs and exposes 2 more clocks
[6] http://lkml.kernel.org/r/20170309104154.28295-1-jbrunet@baylibre.com
[5] http://lkml.kernel.org/r/1488365164-22861-1-git-send-email-narmstrong@baylibre.com
[4] http://lkml.kernel.org/r/20170228093016.5624-1-jbrunet@baylibre.com
[3] http://lkml.kernel.org/r/20170228133002.17894-1-jbrunet@baylibre.com
[2] http://lkml.kernel.org/r/1486721084-1383-1-git-send-email-narmstrong@baylibre.com
[1] http://lkml.kernel.org/r/b098c4fa9fce88361cca20417978734d0e1b5cca.1485939041.git-series.maxime.ripard@free-electrons.com
Neil Armstrong (3):
clk: meson-gxbb: Add MALI clock IDS
clk: meson-gxbb: Add MALI clocks
ARM64: dts: meson-gx: Add MALI nodes for GXBB and GXL
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 37 ++++++
arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi | 43 +++++++
arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi | 1 +
arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi | 1 +
drivers/clk/meson/gxbb.c | 139 +++++++++++++++++++++++
drivers/clk/meson/gxbb.h | 9 +-
include/dt-bindings/clock/gxbb-clkc.h | 5 +
7 files changed, 234 insertions(+), 1 deletion(-)
create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi
--
1.9.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v3 1/3] clk: meson-gxbb: Add MALI clock IDS
2017-03-09 12:53 [PATCH v3 0/3] meson-gx: Add mali-450 support Neil Armstrong
@ 2017-03-09 12:53 ` Neil Armstrong
2017-03-21 23:28 ` Michael Turquette
2017-03-09 12:53 ` [PATCH v3 2/3] clk: meson-gxbb: Add MALI clocks Neil Armstrong
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Neil Armstrong @ 2017-03-09 12:53 UTC (permalink / raw)
To: sboyd, khilman, carlo
Cc: Neil Armstrong, linux-amlogic, linux-clk, linux-arm-kernel, linux-kernel
Add missing MALI clock IDs and expose the muxes and gates in the dt-bindings.
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
drivers/clk/meson/gxbb.h | 9 ++++++++-
include/dt-bindings/clock/gxbb-clkc.h | 5 +++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h
index 274f587..73efdc3 100644
--- a/drivers/clk/meson/gxbb.h
+++ b/drivers/clk/meson/gxbb.h
@@ -268,8 +268,15 @@
/* CLKID_SAR_ADC_CLK */
/* CLKID_SAR_ADC_SEL */
#define CLKID_SAR_ADC_DIV 99
+/* CLKID_MALI_0_SEL */
+#define CLKID_MALI_0_DIV 101
+/* CLKID_MALI_0 */
+/* CLKID_MALI_1_SEL */
+#define CLKID_MALI_1_DIV 104
+/* CLKID_MALI_1 */
+/* CLKID_MALI */
-#define NR_CLKS 100
+#define NR_CLKS 107
/* include the CLKIDs that have been made part of the stable DT binding */
#include <dt-bindings/clock/gxbb-clkc.h>
diff --git a/include/dt-bindings/clock/gxbb-clkc.h b/include/dt-bindings/clock/gxbb-clkc.h
index f08f06d..ef7d6b7 100644
--- a/include/dt-bindings/clock/gxbb-clkc.h
+++ b/include/dt-bindings/clock/gxbb-clkc.h
@@ -35,5 +35,10 @@
#define CLKID_SD_EMMC_C 96
#define CLKID_SAR_ADC_CLK 97
#define CLKID_SAR_ADC_SEL 98
+#define CLKID_MALI_0_SEL 100
+#define CLKID_MALI_0 102
+#define CLKID_MALI_1_SEL 103
+#define CLKID_MALI_1 105
+#define CLKID_MALI 106
#endif /* __GXBB_CLKC_H */
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v3 2/3] clk: meson-gxbb: Add MALI clocks
2017-03-09 12:53 [PATCH v3 0/3] meson-gx: Add mali-450 support Neil Armstrong
2017-03-09 12:53 ` [PATCH v3 1/3] clk: meson-gxbb: Add MALI clock IDS Neil Armstrong
@ 2017-03-09 12:53 ` Neil Armstrong
2017-03-21 23:31 ` Michael Turquette
2017-03-09 12:53 ` [PATCH v3 3/3] ARM64: dts: meson-gx: Add MALI nodes for GXBB and GXL Neil Armstrong
2017-03-11 0:42 ` [PATCH v3 0/3] meson-gx: Add mali-450 support Kevin Hilman
3 siblings, 1 reply; 9+ messages in thread
From: Neil Armstrong @ 2017-03-09 12:53 UTC (permalink / raw)
To: sboyd, khilman, carlo
Cc: Neil Armstrong, linux-amlogic, linux-clk, linux-arm-kernel, linux-kernel
The Mali is clocked by two identical clock paths behind a glitch free mux
to safely change frequency while running.
The two "mali_0" and "mali_1" clocks are composed of a mux, divider and gate.
Expose these two clocks trees using generic clocks.
Finally the glitch free mux is added as "mali" clock.
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
drivers/clk/meson/gxbb.c | 139 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 139 insertions(+)
diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c
index 5059c7b..d9f7fef 100644
--- a/drivers/clk/meson/gxbb.c
+++ b/drivers/clk/meson/gxbb.c
@@ -634,6 +634,131 @@
},
};
+/*
+ * The MALI IP is clocked by two identical clocks (mali_0 and mali_1)
+ * muxed by a glitch-free switch.
+ */
+
+static u32 mux_table_mali_0_1[] = {0, 1, 2, 3, 4, 5, 6, 7};
+static const char *gxbb_mali_0_1_parent_names[] = {
+ "xtal", "gp0_pll", "mpll2", "mpll1", "fclk_div7",
+ "fclk_div4", "fclk_div3", "fclk_div5"
+};
+
+static struct clk_mux gxbb_mali_0_sel = {
+ .reg = (void *)HHI_MALI_CLK_CNTL,
+ .mask = 0x7,
+ .shift = 9,
+ .table = mux_table_mali_0_1,
+ .lock = &clk_lock,
+ .hw.init = &(struct clk_init_data){
+ .name = "mali_0_sel",
+ .ops = &clk_mux_ops,
+ /*
+ * bits 10:9 selects from 8 possible parents:
+ * xtal, gp0_pll, mpll2, mpll1, fclk_div7,
+ * fclk_div4, fclk_div3, fclk_div5
+ */
+ .parent_names = gxbb_mali_0_1_parent_names,
+ .num_parents = 8,
+ .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED),
+ },
+};
+
+static struct clk_divider gxbb_mali_0_div = {
+ .reg = (void *)HHI_MALI_CLK_CNTL,
+ .shift = 0,
+ .width = 7,
+ .lock = &clk_lock,
+ .hw.init = &(struct clk_init_data){
+ .name = "mali_0_div",
+ .ops = &clk_divider_ops,
+ .parent_names = (const char *[]){ "mali_0_sel" },
+ .num_parents = 1,
+ .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED),
+ },
+};
+
+static struct clk_gate gxbb_mali_0 = {
+ .reg = (void *)HHI_MALI_CLK_CNTL,
+ .bit_idx = 8,
+ .lock = &clk_lock,
+ .hw.init = &(struct clk_init_data){
+ .name = "mali_0",
+ .ops = &clk_gate_ops,
+ .parent_names = (const char *[]){ "mali_0_div" },
+ .num_parents = 1,
+ .flags = (CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED),
+ },
+};
+
+static struct clk_mux gxbb_mali_1_sel = {
+ .reg = (void *)HHI_MALI_CLK_CNTL,
+ .mask = 0x7,
+ .shift = 25,
+ .table = mux_table_mali_0_1,
+ .lock = &clk_lock,
+ .hw.init = &(struct clk_init_data){
+ .name = "mali_1_sel",
+ .ops = &clk_mux_ops,
+ /*
+ * bits 10:9 selects from 8 possible parents:
+ * xtal, gp0_pll, mpll2, mpll1, fclk_div7,
+ * fclk_div4, fclk_div3, fclk_div5
+ */
+ .parent_names = gxbb_mali_0_1_parent_names,
+ .num_parents = 8,
+ .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED),
+ },
+};
+
+static struct clk_divider gxbb_mali_1_div = {
+ .reg = (void *)HHI_MALI_CLK_CNTL,
+ .shift = 16,
+ .width = 7,
+ .lock = &clk_lock,
+ .hw.init = &(struct clk_init_data){
+ .name = "mali_1_div",
+ .ops = &clk_divider_ops,
+ .parent_names = (const char *[]){ "mali_1_sel" },
+ .num_parents = 1,
+ .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED),
+ },
+};
+
+static struct clk_gate gxbb_mali_1 = {
+ .reg = (void *)HHI_MALI_CLK_CNTL,
+ .bit_idx = 24,
+ .lock = &clk_lock,
+ .hw.init = &(struct clk_init_data){
+ .name = "mali_1",
+ .ops = &clk_gate_ops,
+ .parent_names = (const char *[]){ "mali_1_div" },
+ .num_parents = 1,
+ .flags = (CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED),
+ },
+};
+
+static u32 mux_table_mali[] = {0, 1};
+static const char *gxbb_mali_parent_names[] = {
+ "mali_0", "mali_1"
+};
+
+static struct clk_mux gxbb_mali = {
+ .reg = (void *)HHI_MALI_CLK_CNTL,
+ .mask = 1,
+ .shift = 31,
+ .table = mux_table_mali,
+ .lock = &clk_lock,
+ .hw.init = &(struct clk_init_data){
+ .name = "mali",
+ .ops = &clk_mux_ops,
+ .parent_names = gxbb_mali_parent_names,
+ .num_parents = 2,
+ .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED),
+ },
+};
+
/* Everything Else (EE) domain gates */
static MESON_GATE(gxbb_ddr, HHI_GCLK_MPEG0, 0);
static MESON_GATE(gxbb_dos, HHI_GCLK_MPEG0, 1);
@@ -827,6 +952,13 @@
[CLKID_SAR_ADC_CLK] = &gxbb_sar_adc_clk.hw,
[CLKID_SAR_ADC_SEL] = &gxbb_sar_adc_clk_sel.hw,
[CLKID_SAR_ADC_DIV] = &gxbb_sar_adc_clk_div.hw,
+ [CLKID_MALI_0_SEL] = &gxbb_mali_0_sel.hw,
+ [CLKID_MALI_0_DIV] = &gxbb_mali_0_div.hw,
+ [CLKID_MALI_0] = &gxbb_mali_0.hw,
+ [CLKID_MALI_1_SEL] = &gxbb_mali_1_sel.hw,
+ [CLKID_MALI_1_DIV] = &gxbb_mali_1_div.hw,
+ [CLKID_MALI_1] = &gxbb_mali_1.hw,
+ [CLKID_MALI] = &gxbb_mali.hw,
},
.num = NR_CLKS,
};
@@ -930,16 +1062,23 @@
&gxbb_emmc_b,
&gxbb_emmc_c,
&gxbb_sar_adc_clk,
+ &gxbb_mali_0,
+ &gxbb_mali_1,
};
static struct clk_mux *const gxbb_clk_muxes[] = {
&gxbb_mpeg_clk_sel,
&gxbb_sar_adc_clk_sel,
+ &gxbb_mali_0_sel,
+ &gxbb_mali_1_sel,
+ &gxbb_mali,
};
static struct clk_divider *const gxbb_clk_dividers[] = {
&gxbb_mpeg_clk_div,
&gxbb_sar_adc_clk_div,
+ &gxbb_mali_0_div,
+ &gxbb_mali_1_div,
};
static int gxbb_clkc_probe(struct platform_device *pdev)
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v3 3/3] ARM64: dts: meson-gx: Add MALI nodes for GXBB and GXL
2017-03-09 12:53 [PATCH v3 0/3] meson-gx: Add mali-450 support Neil Armstrong
2017-03-09 12:53 ` [PATCH v3 1/3] clk: meson-gxbb: Add MALI clock IDS Neil Armstrong
2017-03-09 12:53 ` [PATCH v3 2/3] clk: meson-gxbb: Add MALI clocks Neil Armstrong
@ 2017-03-09 12:53 ` Neil Armstrong
2017-03-11 0:42 ` [PATCH v3 0/3] meson-gx: Add mali-450 support Kevin Hilman
3 siblings, 0 replies; 9+ messages in thread
From: Neil Armstrong @ 2017-03-09 12:53 UTC (permalink / raw)
To: sboyd, khilman, carlo
Cc: Neil Armstrong, linux-amlogic, linux-clk, linux-arm-kernel,
linux-kernel, devicetree
The same MALI-450 MP3 GPU is present in the GXBB and GXL SoCs.
The node is simply added in the meson-gxbb.dtsi file.
For GXL, since a lot is shared with the GXM that has a MALI-T820 IP, this
patch adds a new meson-gxl-mali.dtsi and is included in the SoC specific
dtsi files.
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 37 ++++++++++++++++++++
arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi | 43 ++++++++++++++++++++++++
arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi | 1 +
arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi | 1 +
4 files changed, 82 insertions(+)
create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
index 04b3324..0617a3d 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@ -478,6 +478,43 @@
};
};
+&apb {
+ mali: gpu@c0000 {
+ compatible = "amlogic,meson-gxbb-mali", "arm,mali-450";
+ reg = <0x0 0xc0000 0x0 0x40000>;
+ interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "gp", "gpmmu", "pp", "pmu",
+ "pp0", "ppmmu0", "pp1", "ppmmu1",
+ "pp2", "ppmmu2";
+ clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_MALI>;
+ clock-names = "bus", "core";
+
+ /*
+ * Mali clocking is provided by two identical clock paths
+ * MALI_0 and MALI_1 muxed to a single clock by a glitch
+ * free mux to safely change frequency while running.
+ */
+ assigned-clocks = <&clkc CLKID_MALI_0_SEL>,
+ <&clkc CLKID_MALI_0>,
+ <&clkc CLKID_MALI>; /* Glitch free mux */
+ assigned-clock-parents = <&clkc CLKID_FCLK_DIV3>,
+ <0>, /* Do Nothing */
+ <&clkc CLKID_MALI_0>;
+ assigned-clock-rates = <0>, /* Do Nothing */
+ <666666666>,
+ <0>; /* Do Nothing */
+ };
+};
+
&i2c_A {
clocks = <&clkc CLKID_I2C>;
};
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi
new file mode 100644
index 0000000..f06cc234
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2017 BayLibre SAS
+ * Author: Neil Armstrong <narmstrong@baylibre.com>
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+ */
+
+&apb {
+ mali: gpu@c0000 {
+ compatible = "amlogic,meson-gxbb-mali", "arm,mali-450";
+ reg = <0x0 0xc0000 0x0 0x40000>;
+ interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "gp", "gpmmu", "pp", "pmu",
+ "pp0", "ppmmu0", "pp1", "ppmmu1",
+ "pp2", "ppmmu2";
+ clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_MALI>;
+ clock-names = "bus", "core";
+
+ /*
+ * Mali clocking is provided by two identical clock paths
+ * MALI_0 and MALI_1 muxed to a single clock by a glitch
+ * free mux to safely change frequency while running.
+ */
+ assigned-clocks = <&clkc CLKID_MALI_0_SEL>,
+ <&clkc CLKID_MALI_0>,
+ <&clkc CLKID_MALI>; /* Glitch free mux */
+ assigned-clock-parents = <&clkc CLKID_FCLK_DIV3>,
+ <0>, /* Do Nothing */
+ <&clkc CLKID_MALI_0>;
+ assigned-clock-rates = <0>, /* Do Nothing */
+ <666666666>,
+ <0>; /* Do Nothing */
+ };
+};
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi
index 615308e..5a90e30 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi
@@ -42,6 +42,7 @@
*/
#include "meson-gxl.dtsi"
+#include "meson-gxl-mali.dtsi"
/ {
compatible = "amlogic,s905d", "amlogic,meson-gxl";
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi
index 08237ee..0f78d83 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi
@@ -42,6 +42,7 @@
*/
#include "meson-gxl.dtsi"
+#include "meson-gxl-mali.dtsi"
/ {
compatible = "amlogic,s905x", "amlogic,meson-gxl";
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v3 0/3] meson-gx: Add mali-450 support
2017-03-09 12:53 [PATCH v3 0/3] meson-gx: Add mali-450 support Neil Armstrong
` (2 preceding siblings ...)
2017-03-09 12:53 ` [PATCH v3 3/3] ARM64: dts: meson-gx: Add MALI nodes for GXBB and GXL Neil Armstrong
@ 2017-03-11 0:42 ` Kevin Hilman
3 siblings, 0 replies; 9+ messages in thread
From: Kevin Hilman @ 2017-03-11 0:42 UTC (permalink / raw)
To: Neil Armstrong
Cc: sboyd, carlo, linux-amlogic, linux-clk, linux-arm-kernel, linux-kernel
Neil Armstrong <narmstrong@baylibre.com> writes:
> Since the merge of the Mali dt bindings at [1], add support for Mali clocks
> and DT node.
>
> The Mali is clocked by two identical clock paths behind a glitch free mux
> to safely change frequency while running.
> So these clocks must be added to the meson-gxbb clock controller.
>
>
> Changes since v2 at [5] :
> - Rebased on v2 Audio Clocks patchset from Jerome Brunet at [6]
Due to this dependency, I'd prefer patches 1-2 go through the clk tree
(into an immutable branch along with the audio changes) and then I'll
pick up the DT change through the amlogic tree.
Kevin
> - Marked parents names list as static
> - Reworded patch 3 commit message
>
> Changes since v1 at [2] :
> - Remove GP0 fixes, this will pushed later, for base frequency it can depend on fclk_div3
> - Add GXL support
> - rebase on clk-next and jbrunet's patchset at [3] and [4]
> - get rid of composite clocks, this adds more clocks IDs and exposes 2 more clocks
>
> [6] http://lkml.kernel.org/r/20170309104154.28295-1-jbrunet@baylibre.com
> [5] http://lkml.kernel.org/r/1488365164-22861-1-git-send-email-narmstrong@baylibre.com
> [4] http://lkml.kernel.org/r/20170228093016.5624-1-jbrunet@baylibre.com
> [3] http://lkml.kernel.org/r/20170228133002.17894-1-jbrunet@baylibre.com
> [2] http://lkml.kernel.org/r/1486721084-1383-1-git-send-email-narmstrong@baylibre.com
> [1] http://lkml.kernel.org/r/b098c4fa9fce88361cca20417978734d0e1b5cca.1485939041.git-series.maxime.ripard@free-electrons.com
>
> Neil Armstrong (3):
> clk: meson-gxbb: Add MALI clock IDS
> clk: meson-gxbb: Add MALI clocks
> ARM64: dts: meson-gx: Add MALI nodes for GXBB and GXL
>
> arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 37 ++++++
> arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi | 43 +++++++
> arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi | 1 +
> arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi | 1 +
> drivers/clk/meson/gxbb.c | 139 +++++++++++++++++++++++
> drivers/clk/meson/gxbb.h | 9 +-
> include/dt-bindings/clock/gxbb-clkc.h | 5 +
> 7 files changed, 234 insertions(+), 1 deletion(-)
> create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 1/3] clk: meson-gxbb: Add MALI clock IDS
2017-03-09 12:53 ` [PATCH v3 1/3] clk: meson-gxbb: Add MALI clock IDS Neil Armstrong
@ 2017-03-21 23:28 ` Michael Turquette
0 siblings, 0 replies; 9+ messages in thread
From: Michael Turquette @ 2017-03-21 23:28 UTC (permalink / raw)
To: Neil Armstrong, sboyd, khilman, carlo
Cc: Neil Armstrong, linux-amlogic, linux-clk, linux-arm-kernel, linux-kernel
Quoting Neil Armstrong (2017-03-09 04:53:45)
> Add missing MALI clock IDs and expose the muxes and gates in the dt-bindings.
>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Looks good to me.
Regards,
Mike
> ---
> drivers/clk/meson/gxbb.h | 9 ++++++++-
> include/dt-bindings/clock/gxbb-clkc.h | 5 +++++
> 2 files changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h
> index 274f587..73efdc3 100644
> --- a/drivers/clk/meson/gxbb.h
> +++ b/drivers/clk/meson/gxbb.h
> @@ -268,8 +268,15 @@
> /* CLKID_SAR_ADC_CLK */
> /* CLKID_SAR_ADC_SEL */
> #define CLKID_SAR_ADC_DIV 99
> +/* CLKID_MALI_0_SEL */
> +#define CLKID_MALI_0_DIV 101
> +/* CLKID_MALI_0 */
> +/* CLKID_MALI_1_SEL */
> +#define CLKID_MALI_1_DIV 104
> +/* CLKID_MALI_1 */
> +/* CLKID_MALI */
>
> -#define NR_CLKS 100
> +#define NR_CLKS 107
>
> /* include the CLKIDs that have been made part of the stable DT binding */
> #include <dt-bindings/clock/gxbb-clkc.h>
> diff --git a/include/dt-bindings/clock/gxbb-clkc.h b/include/dt-bindings/clock/gxbb-clkc.h
> index f08f06d..ef7d6b7 100644
> --- a/include/dt-bindings/clock/gxbb-clkc.h
> +++ b/include/dt-bindings/clock/gxbb-clkc.h
> @@ -35,5 +35,10 @@
> #define CLKID_SD_EMMC_C 96
> #define CLKID_SAR_ADC_CLK 97
> #define CLKID_SAR_ADC_SEL 98
> +#define CLKID_MALI_0_SEL 100
> +#define CLKID_MALI_0 102
> +#define CLKID_MALI_1_SEL 103
> +#define CLKID_MALI_1 105
> +#define CLKID_MALI 106
>
> #endif /* __GXBB_CLKC_H */
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 2/3] clk: meson-gxbb: Add MALI clocks
2017-03-09 12:53 ` [PATCH v3 2/3] clk: meson-gxbb: Add MALI clocks Neil Armstrong
@ 2017-03-21 23:31 ` Michael Turquette
2017-03-22 9:14 ` Neil Armstrong
0 siblings, 1 reply; 9+ messages in thread
From: Michael Turquette @ 2017-03-21 23:31 UTC (permalink / raw)
To: Neil Armstrong, sboyd, khilman, carlo
Cc: Neil Armstrong, linux-amlogic, linux-clk, linux-arm-kernel, linux-kernel
Hi Neil,
Quoting Neil Armstrong (2017-03-09 04:53:46)
> The Mali is clocked by two identical clock paths behind a glitch free mux
> to safely change frequency while running.
>
> The two "mali_0" and "mali_1" clocks are composed of a mux, divider and gate.
> Expose these two clocks trees using generic clocks.
> Finally the glitch free mux is added as "mali" clock.
>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
> drivers/clk/meson/gxbb.c | 139 +++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 139 insertions(+)
>
> diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c
> index 5059c7b..d9f7fef 100644
> --- a/drivers/clk/meson/gxbb.c
> +++ b/drivers/clk/meson/gxbb.c
> @@ -634,6 +634,131 @@
> },
> };
>
> +/*
> + * The MALI IP is clocked by two identical clocks (mali_0 and mali_1)
> + * muxed by a glitch-free switch.
> + */
> +
> +static u32 mux_table_mali_0_1[] = {0, 1, 2, 3, 4, 5, 6, 7};
> +static const char *gxbb_mali_0_1_parent_names[] = {
> + "xtal", "gp0_pll", "mpll2", "mpll1", "fclk_div7",
> + "fclk_div4", "fclk_div3", "fclk_div5"
> +};
> +
> +static struct clk_mux gxbb_mali_0_sel = {
> + .reg = (void *)HHI_MALI_CLK_CNTL,
> + .mask = 0x7,
> + .shift = 9,
> + .table = mux_table_mali_0_1,
> + .lock = &clk_lock,
> + .hw.init = &(struct clk_init_data){
> + .name = "mali_0_sel",
> + .ops = &clk_mux_ops,
> + /*
> + * bits 10:9 selects from 8 possible parents:
> + * xtal, gp0_pll, mpll2, mpll1, fclk_div7,
> + * fclk_div4, fclk_div3, fclk_div5
> + */
> + .parent_names = gxbb_mali_0_1_parent_names,
> + .num_parents = 8,
> + .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED),
Are all of these CLK_IGNORE_UNUSED flags necessary? If so, why? I'm just
wondering if this is yet another display-related use case where a
hand-off mechanism would work better?
Thanks,
Mike
> + },
> +};
> +
> +static struct clk_divider gxbb_mali_0_div = {
> + .reg = (void *)HHI_MALI_CLK_CNTL,
> + .shift = 0,
> + .width = 7,
> + .lock = &clk_lock,
> + .hw.init = &(struct clk_init_data){
> + .name = "mali_0_div",
> + .ops = &clk_divider_ops,
> + .parent_names = (const char *[]){ "mali_0_sel" },
> + .num_parents = 1,
> + .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED),
> + },
> +};
> +
> +static struct clk_gate gxbb_mali_0 = {
> + .reg = (void *)HHI_MALI_CLK_CNTL,
> + .bit_idx = 8,
> + .lock = &clk_lock,
> + .hw.init = &(struct clk_init_data){
> + .name = "mali_0",
> + .ops = &clk_gate_ops,
> + .parent_names = (const char *[]){ "mali_0_div" },
> + .num_parents = 1,
> + .flags = (CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED),
> + },
> +};
> +
> +static struct clk_mux gxbb_mali_1_sel = {
> + .reg = (void *)HHI_MALI_CLK_CNTL,
> + .mask = 0x7,
> + .shift = 25,
> + .table = mux_table_mali_0_1,
> + .lock = &clk_lock,
> + .hw.init = &(struct clk_init_data){
> + .name = "mali_1_sel",
> + .ops = &clk_mux_ops,
> + /*
> + * bits 10:9 selects from 8 possible parents:
> + * xtal, gp0_pll, mpll2, mpll1, fclk_div7,
> + * fclk_div4, fclk_div3, fclk_div5
> + */
> + .parent_names = gxbb_mali_0_1_parent_names,
> + .num_parents = 8,
> + .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED),
> + },
> +};
> +
> +static struct clk_divider gxbb_mali_1_div = {
> + .reg = (void *)HHI_MALI_CLK_CNTL,
> + .shift = 16,
> + .width = 7,
> + .lock = &clk_lock,
> + .hw.init = &(struct clk_init_data){
> + .name = "mali_1_div",
> + .ops = &clk_divider_ops,
> + .parent_names = (const char *[]){ "mali_1_sel" },
> + .num_parents = 1,
> + .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED),
> + },
> +};
> +
> +static struct clk_gate gxbb_mali_1 = {
> + .reg = (void *)HHI_MALI_CLK_CNTL,
> + .bit_idx = 24,
> + .lock = &clk_lock,
> + .hw.init = &(struct clk_init_data){
> + .name = "mali_1",
> + .ops = &clk_gate_ops,
> + .parent_names = (const char *[]){ "mali_1_div" },
> + .num_parents = 1,
> + .flags = (CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED),
> + },
> +};
> +
> +static u32 mux_table_mali[] = {0, 1};
> +static const char *gxbb_mali_parent_names[] = {
> + "mali_0", "mali_1"
> +};
> +
> +static struct clk_mux gxbb_mali = {
> + .reg = (void *)HHI_MALI_CLK_CNTL,
> + .mask = 1,
> + .shift = 31,
> + .table = mux_table_mali,
> + .lock = &clk_lock,
> + .hw.init = &(struct clk_init_data){
> + .name = "mali",
> + .ops = &clk_mux_ops,
> + .parent_names = gxbb_mali_parent_names,
> + .num_parents = 2,
> + .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED),
> + },
> +};
> +
> /* Everything Else (EE) domain gates */
> static MESON_GATE(gxbb_ddr, HHI_GCLK_MPEG0, 0);
> static MESON_GATE(gxbb_dos, HHI_GCLK_MPEG0, 1);
> @@ -827,6 +952,13 @@
> [CLKID_SAR_ADC_CLK] = &gxbb_sar_adc_clk.hw,
> [CLKID_SAR_ADC_SEL] = &gxbb_sar_adc_clk_sel.hw,
> [CLKID_SAR_ADC_DIV] = &gxbb_sar_adc_clk_div.hw,
> + [CLKID_MALI_0_SEL] = &gxbb_mali_0_sel.hw,
> + [CLKID_MALI_0_DIV] = &gxbb_mali_0_div.hw,
> + [CLKID_MALI_0] = &gxbb_mali_0.hw,
> + [CLKID_MALI_1_SEL] = &gxbb_mali_1_sel.hw,
> + [CLKID_MALI_1_DIV] = &gxbb_mali_1_div.hw,
> + [CLKID_MALI_1] = &gxbb_mali_1.hw,
> + [CLKID_MALI] = &gxbb_mali.hw,
> },
> .num = NR_CLKS,
> };
> @@ -930,16 +1062,23 @@
> &gxbb_emmc_b,
> &gxbb_emmc_c,
> &gxbb_sar_adc_clk,
> + &gxbb_mali_0,
> + &gxbb_mali_1,
> };
>
> static struct clk_mux *const gxbb_clk_muxes[] = {
> &gxbb_mpeg_clk_sel,
> &gxbb_sar_adc_clk_sel,
> + &gxbb_mali_0_sel,
> + &gxbb_mali_1_sel,
> + &gxbb_mali,
> };
>
> static struct clk_divider *const gxbb_clk_dividers[] = {
> &gxbb_mpeg_clk_div,
> &gxbb_sar_adc_clk_div,
> + &gxbb_mali_0_div,
> + &gxbb_mali_1_div,
> };
>
> static int gxbb_clkc_probe(struct platform_device *pdev)
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 2/3] clk: meson-gxbb: Add MALI clocks
2017-03-21 23:31 ` Michael Turquette
@ 2017-03-22 9:14 ` Neil Armstrong
2017-03-23 1:28 ` Michael Turquette
0 siblings, 1 reply; 9+ messages in thread
From: Neil Armstrong @ 2017-03-22 9:14 UTC (permalink / raw)
To: Michael Turquette, sboyd, khilman, carlo
Cc: linux-amlogic, linux-clk, linux-arm-kernel, linux-kernel
On 03/22/2017 12:31 AM, Michael Turquette wrote:
> Hi Neil,
>
> Quoting Neil Armstrong (2017-03-09 04:53:46)
>> The Mali is clocked by two identical clock paths behind a glitch free mux
>> to safely change frequency while running.
>>
>> The two "mali_0" and "mali_1" clocks are composed of a mux, divider and gate.
>> Expose these two clocks trees using generic clocks.
>> Finally the glitch free mux is added as "mali" clock.
>>
>> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
>> ---
>> drivers/clk/meson/gxbb.c | 139 +++++++++++++++++++++++++++++++++++++++++++++++
>> 1 file changed, 139 insertions(+)
>>
>> diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c
>> index 5059c7b..d9f7fef 100644
>> --- a/drivers/clk/meson/gxbb.c
>> +++ b/drivers/clk/meson/gxbb.c
>> @@ -634,6 +634,131 @@
>> },
>> };
>>
>> +/*
>> + * The MALI IP is clocked by two identical clocks (mali_0 and mali_1)
>> + * muxed by a glitch-free switch.
>> + */
>> +
>> +static u32 mux_table_mali_0_1[] = {0, 1, 2, 3, 4, 5, 6, 7};
>> +static const char *gxbb_mali_0_1_parent_names[] = {
>> + "xtal", "gp0_pll", "mpll2", "mpll1", "fclk_div7",
>> + "fclk_div4", "fclk_div3", "fclk_div5"
>> +};
>> +
>> +static struct clk_mux gxbb_mali_0_sel = {
>> + .reg = (void *)HHI_MALI_CLK_CNTL,
>> + .mask = 0x7,
>> + .shift = 9,
>> + .table = mux_table_mali_0_1,
>> + .lock = &clk_lock,
>> + .hw.init = &(struct clk_init_data){
>> + .name = "mali_0_sel",
>> + .ops = &clk_mux_ops,
>> + /*
>> + * bits 10:9 selects from 8 possible parents:
>> + * xtal, gp0_pll, mpll2, mpll1, fclk_div7,
>> + * fclk_div4, fclk_div3, fclk_div5
>> + */
>> + .parent_names = gxbb_mali_0_1_parent_names,
>> + .num_parents = 8,
>> + .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED),
>
> Are all of these CLK_IGNORE_UNUSED flags necessary? If so, why? I'm just
> wondering if this is yet another display-related use case where a
> hand-off mechanism would work better?
Hi,
I'm just precocious about how these clocks will be handled, since the Mali driver
is out of tree, I'm not sure about how they will be handled at all.
But I can test and remove these if we consider my out-of-tree driver platform
code as reference.
Neil
>
> Thanks,
> Mike
>
>> + },
>> +};
>> +
>> +static struct clk_divider gxbb_mali_0_div = {
>> + .reg = (void *)HHI_MALI_CLK_CNTL,
>> + .shift = 0,
>> + .width = 7,
>> + .lock = &clk_lock,
>> + .hw.init = &(struct clk_init_data){
>> + .name = "mali_0_div",
>> + .ops = &clk_divider_ops,
>> + .parent_names = (const char *[]){ "mali_0_sel" },
>> + .num_parents = 1,
>> + .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED),
>> + },
>> +};
>> +
>> +static struct clk_gate gxbb_mali_0 = {
>> + .reg = (void *)HHI_MALI_CLK_CNTL,
>> + .bit_idx = 8,
>> + .lock = &clk_lock,
>> + .hw.init = &(struct clk_init_data){
>> + .name = "mali_0",
>> + .ops = &clk_gate_ops,
>> + .parent_names = (const char *[]){ "mali_0_div" },
>> + .num_parents = 1,
>> + .flags = (CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED),
>> + },
>> +};
>> +
>> +static struct clk_mux gxbb_mali_1_sel = {
>> + .reg = (void *)HHI_MALI_CLK_CNTL,
>> + .mask = 0x7,
>> + .shift = 25,
>> + .table = mux_table_mali_0_1,
>> + .lock = &clk_lock,
>> + .hw.init = &(struct clk_init_data){
>> + .name = "mali_1_sel",
>> + .ops = &clk_mux_ops,
>> + /*
>> + * bits 10:9 selects from 8 possible parents:
>> + * xtal, gp0_pll, mpll2, mpll1, fclk_div7,
>> + * fclk_div4, fclk_div3, fclk_div5
>> + */
>> + .parent_names = gxbb_mali_0_1_parent_names,
>> + .num_parents = 8,
>> + .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED),
>> + },
>> +};
>> +
>> +static struct clk_divider gxbb_mali_1_div = {
>> + .reg = (void *)HHI_MALI_CLK_CNTL,
>> + .shift = 16,
>> + .width = 7,
>> + .lock = &clk_lock,
>> + .hw.init = &(struct clk_init_data){
>> + .name = "mali_1_div",
>> + .ops = &clk_divider_ops,
>> + .parent_names = (const char *[]){ "mali_1_sel" },
>> + .num_parents = 1,
>> + .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED),
>> + },
>> +};
>> +
>> +static struct clk_gate gxbb_mali_1 = {
>> + .reg = (void *)HHI_MALI_CLK_CNTL,
>> + .bit_idx = 24,
>> + .lock = &clk_lock,
>> + .hw.init = &(struct clk_init_data){
>> + .name = "mali_1",
>> + .ops = &clk_gate_ops,
>> + .parent_names = (const char *[]){ "mali_1_div" },
>> + .num_parents = 1,
>> + .flags = (CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED),
>> + },
>> +};
>> +
>> +static u32 mux_table_mali[] = {0, 1};
>> +static const char *gxbb_mali_parent_names[] = {
>> + "mali_0", "mali_1"
>> +};
>> +
>> +static struct clk_mux gxbb_mali = {
>> + .reg = (void *)HHI_MALI_CLK_CNTL,
>> + .mask = 1,
>> + .shift = 31,
>> + .table = mux_table_mali,
>> + .lock = &clk_lock,
>> + .hw.init = &(struct clk_init_data){
>> + .name = "mali",
>> + .ops = &clk_mux_ops,
>> + .parent_names = gxbb_mali_parent_names,
>> + .num_parents = 2,
>> + .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED),
>> + },
>> +};
>> +
>> /* Everything Else (EE) domain gates */
>> static MESON_GATE(gxbb_ddr, HHI_GCLK_MPEG0, 0);
>> static MESON_GATE(gxbb_dos, HHI_GCLK_MPEG0, 1);
>> @@ -827,6 +952,13 @@
>> [CLKID_SAR_ADC_CLK] = &gxbb_sar_adc_clk.hw,
>> [CLKID_SAR_ADC_SEL] = &gxbb_sar_adc_clk_sel.hw,
>> [CLKID_SAR_ADC_DIV] = &gxbb_sar_adc_clk_div.hw,
>> + [CLKID_MALI_0_SEL] = &gxbb_mali_0_sel.hw,
>> + [CLKID_MALI_0_DIV] = &gxbb_mali_0_div.hw,
>> + [CLKID_MALI_0] = &gxbb_mali_0.hw,
>> + [CLKID_MALI_1_SEL] = &gxbb_mali_1_sel.hw,
>> + [CLKID_MALI_1_DIV] = &gxbb_mali_1_div.hw,
>> + [CLKID_MALI_1] = &gxbb_mali_1.hw,
>> + [CLKID_MALI] = &gxbb_mali.hw,
>> },
>> .num = NR_CLKS,
>> };
>> @@ -930,16 +1062,23 @@
>> &gxbb_emmc_b,
>> &gxbb_emmc_c,
>> &gxbb_sar_adc_clk,
>> + &gxbb_mali_0,
>> + &gxbb_mali_1,
>> };
>>
>> static struct clk_mux *const gxbb_clk_muxes[] = {
>> &gxbb_mpeg_clk_sel,
>> &gxbb_sar_adc_clk_sel,
>> + &gxbb_mali_0_sel,
>> + &gxbb_mali_1_sel,
>> + &gxbb_mali,
>> };
>>
>> static struct clk_divider *const gxbb_clk_dividers[] = {
>> &gxbb_mpeg_clk_div,
>> &gxbb_sar_adc_clk_div,
>> + &gxbb_mali_0_div,
>> + &gxbb_mali_1_div,
>> };
>>
>> static int gxbb_clkc_probe(struct platform_device *pdev)
>> --
>> 1.9.1
>>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 2/3] clk: meson-gxbb: Add MALI clocks
2017-03-22 9:14 ` Neil Armstrong
@ 2017-03-23 1:28 ` Michael Turquette
0 siblings, 0 replies; 9+ messages in thread
From: Michael Turquette @ 2017-03-23 1:28 UTC (permalink / raw)
To: Neil Armstrong, sboyd, khilman, carlo
Cc: linux-amlogic, linux-clk, linux-arm-kernel, linux-kernel
Quoting Neil Armstrong (2017-03-22 02:14:40)
> On 03/22/2017 12:31 AM, Michael Turquette wrote:
> > Hi Neil,
> >
> > Quoting Neil Armstrong (2017-03-09 04:53:46)
> >> The Mali is clocked by two identical clock paths behind a glitch free mux
> >> to safely change frequency while running.
> >>
> >> The two "mali_0" and "mali_1" clocks are composed of a mux, divider and gate.
> >> Expose these two clocks trees using generic clocks.
> >> Finally the glitch free mux is added as "mali" clock.
> >>
> >> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> >> ---
> >> drivers/clk/meson/gxbb.c | 139 +++++++++++++++++++++++++++++++++++++++++++++++
> >> 1 file changed, 139 insertions(+)
> >>
> >> diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c
> >> index 5059c7b..d9f7fef 100644
> >> --- a/drivers/clk/meson/gxbb.c
> >> +++ b/drivers/clk/meson/gxbb.c
> >> @@ -634,6 +634,131 @@
> >> },
> >> };
> >>
> >> +/*
> >> + * The MALI IP is clocked by two identical clocks (mali_0 and mali_1)
> >> + * muxed by a glitch-free switch.
> >> + */
> >> +
> >> +static u32 mux_table_mali_0_1[] = {0, 1, 2, 3, 4, 5, 6, 7};
> >> +static const char *gxbb_mali_0_1_parent_names[] = {
> >> + "xtal", "gp0_pll", "mpll2", "mpll1", "fclk_div7",
> >> + "fclk_div4", "fclk_div3", "fclk_div5"
> >> +};
> >> +
> >> +static struct clk_mux gxbb_mali_0_sel = {
> >> + .reg = (void *)HHI_MALI_CLK_CNTL,
> >> + .mask = 0x7,
> >> + .shift = 9,
> >> + .table = mux_table_mali_0_1,
> >> + .lock = &clk_lock,
> >> + .hw.init = &(struct clk_init_data){
> >> + .name = "mali_0_sel",
> >> + .ops = &clk_mux_ops,
> >> + /*
> >> + * bits 10:9 selects from 8 possible parents:
> >> + * xtal, gp0_pll, mpll2, mpll1, fclk_div7,
> >> + * fclk_div4, fclk_div3, fclk_div5
> >> + */
> >> + .parent_names = gxbb_mali_0_1_parent_names,
> >> + .num_parents = 8,
> >> + .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED),
> >
> > Are all of these CLK_IGNORE_UNUSED flags necessary? If so, why? I'm just
> > wondering if this is yet another display-related use case where a
> > hand-off mechanism would work better?
>
> Hi,
>
> I'm just precocious about how these clocks will be handled, since the Mali driver
> is out of tree, I'm not sure about how they will be handled at all.
Sure, but out of tree driver users can always use the clk_disable_unused
bootarg if needed.
>
> But I can test and remove these if we consider my out-of-tree driver platform
> code as reference.
Great, thanks.
Best regards,
Mike
>
> Neil
>
> >
> > Thanks,
> > Mike
> >
> >> + },
> >> +};
> >> +
> >> +static struct clk_divider gxbb_mali_0_div = {
> >> + .reg = (void *)HHI_MALI_CLK_CNTL,
> >> + .shift = 0,
> >> + .width = 7,
> >> + .lock = &clk_lock,
> >> + .hw.init = &(struct clk_init_data){
> >> + .name = "mali_0_div",
> >> + .ops = &clk_divider_ops,
> >> + .parent_names = (const char *[]){ "mali_0_sel" },
> >> + .num_parents = 1,
> >> + .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED),
> >> + },
> >> +};
> >> +
> >> +static struct clk_gate gxbb_mali_0 = {
> >> + .reg = (void *)HHI_MALI_CLK_CNTL,
> >> + .bit_idx = 8,
> >> + .lock = &clk_lock,
> >> + .hw.init = &(struct clk_init_data){
> >> + .name = "mali_0",
> >> + .ops = &clk_gate_ops,
> >> + .parent_names = (const char *[]){ "mali_0_div" },
> >> + .num_parents = 1,
> >> + .flags = (CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED),
> >> + },
> >> +};
> >> +
> >> +static struct clk_mux gxbb_mali_1_sel = {
> >> + .reg = (void *)HHI_MALI_CLK_CNTL,
> >> + .mask = 0x7,
> >> + .shift = 25,
> >> + .table = mux_table_mali_0_1,
> >> + .lock = &clk_lock,
> >> + .hw.init = &(struct clk_init_data){
> >> + .name = "mali_1_sel",
> >> + .ops = &clk_mux_ops,
> >> + /*
> >> + * bits 10:9 selects from 8 possible parents:
> >> + * xtal, gp0_pll, mpll2, mpll1, fclk_div7,
> >> + * fclk_div4, fclk_div3, fclk_div5
> >> + */
> >> + .parent_names = gxbb_mali_0_1_parent_names,
> >> + .num_parents = 8,
> >> + .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED),
> >> + },
> >> +};
> >> +
> >> +static struct clk_divider gxbb_mali_1_div = {
> >> + .reg = (void *)HHI_MALI_CLK_CNTL,
> >> + .shift = 16,
> >> + .width = 7,
> >> + .lock = &clk_lock,
> >> + .hw.init = &(struct clk_init_data){
> >> + .name = "mali_1_div",
> >> + .ops = &clk_divider_ops,
> >> + .parent_names = (const char *[]){ "mali_1_sel" },
> >> + .num_parents = 1,
> >> + .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED),
> >> + },
> >> +};
> >> +
> >> +static struct clk_gate gxbb_mali_1 = {
> >> + .reg = (void *)HHI_MALI_CLK_CNTL,
> >> + .bit_idx = 24,
> >> + .lock = &clk_lock,
> >> + .hw.init = &(struct clk_init_data){
> >> + .name = "mali_1",
> >> + .ops = &clk_gate_ops,
> >> + .parent_names = (const char *[]){ "mali_1_div" },
> >> + .num_parents = 1,
> >> + .flags = (CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED),
> >> + },
> >> +};
> >> +
> >> +static u32 mux_table_mali[] = {0, 1};
> >> +static const char *gxbb_mali_parent_names[] = {
> >> + "mali_0", "mali_1"
> >> +};
> >> +
> >> +static struct clk_mux gxbb_mali = {
> >> + .reg = (void *)HHI_MALI_CLK_CNTL,
> >> + .mask = 1,
> >> + .shift = 31,
> >> + .table = mux_table_mali,
> >> + .lock = &clk_lock,
> >> + .hw.init = &(struct clk_init_data){
> >> + .name = "mali",
> >> + .ops = &clk_mux_ops,
> >> + .parent_names = gxbb_mali_parent_names,
> >> + .num_parents = 2,
> >> + .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED),
> >> + },
> >> +};
> >> +
> >> /* Everything Else (EE) domain gates */
> >> static MESON_GATE(gxbb_ddr, HHI_GCLK_MPEG0, 0);
> >> static MESON_GATE(gxbb_dos, HHI_GCLK_MPEG0, 1);
> >> @@ -827,6 +952,13 @@
> >> [CLKID_SAR_ADC_CLK] = &gxbb_sar_adc_clk.hw,
> >> [CLKID_SAR_ADC_SEL] = &gxbb_sar_adc_clk_sel.hw,
> >> [CLKID_SAR_ADC_DIV] = &gxbb_sar_adc_clk_div.hw,
> >> + [CLKID_MALI_0_SEL] = &gxbb_mali_0_sel.hw,
> >> + [CLKID_MALI_0_DIV] = &gxbb_mali_0_div.hw,
> >> + [CLKID_MALI_0] = &gxbb_mali_0.hw,
> >> + [CLKID_MALI_1_SEL] = &gxbb_mali_1_sel.hw,
> >> + [CLKID_MALI_1_DIV] = &gxbb_mali_1_div.hw,
> >> + [CLKID_MALI_1] = &gxbb_mali_1.hw,
> >> + [CLKID_MALI] = &gxbb_mali.hw,
> >> },
> >> .num = NR_CLKS,
> >> };
> >> @@ -930,16 +1062,23 @@
> >> &gxbb_emmc_b,
> >> &gxbb_emmc_c,
> >> &gxbb_sar_adc_clk,
> >> + &gxbb_mali_0,
> >> + &gxbb_mali_1,
> >> };
> >>
> >> static struct clk_mux *const gxbb_clk_muxes[] = {
> >> &gxbb_mpeg_clk_sel,
> >> &gxbb_sar_adc_clk_sel,
> >> + &gxbb_mali_0_sel,
> >> + &gxbb_mali_1_sel,
> >> + &gxbb_mali,
> >> };
> >>
> >> static struct clk_divider *const gxbb_clk_dividers[] = {
> >> &gxbb_mpeg_clk_div,
> >> &gxbb_sar_adc_clk_div,
> >> + &gxbb_mali_0_div,
> >> + &gxbb_mali_1_div,
> >> };
> >>
> >> static int gxbb_clkc_probe(struct platform_device *pdev)
> >> --
> >> 1.9.1
> >>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-03-23 1:28 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-09 12:53 [PATCH v3 0/3] meson-gx: Add mali-450 support Neil Armstrong
2017-03-09 12:53 ` [PATCH v3 1/3] clk: meson-gxbb: Add MALI clock IDS Neil Armstrong
2017-03-21 23:28 ` Michael Turquette
2017-03-09 12:53 ` [PATCH v3 2/3] clk: meson-gxbb: Add MALI clocks Neil Armstrong
2017-03-21 23:31 ` Michael Turquette
2017-03-22 9:14 ` Neil Armstrong
2017-03-23 1:28 ` Michael Turquette
2017-03-09 12:53 ` [PATCH v3 3/3] ARM64: dts: meson-gx: Add MALI nodes for GXBB and GXL Neil Armstrong
2017-03-11 0:42 ` [PATCH v3 0/3] meson-gx: Add mali-450 support Kevin Hilman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).