soc: amlogic: fixup clock measure
Subsystems (2)
Jerome Brunet
reviewercover soc: amlogic: fixup clock measure
Hi Kevin,
Here are 2 fixup for the clock measure series.
First error was due to the rebase on the v2 of the bus fixup patch Second address some comments Martin had on the initial submission
Feel free to fold these fixups with the related changes if you wish.
Jerome Brunet (2):
arm64: dts: meson: g12a: fix clk_msr node
soc: amlogic: clk-measure: fix-up some clock definitions
arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 8 ++++---- drivers/soc/amlogic/meson-clk-measure.c | 8 +++++--- 2 files changed, 9 insertions(+), 7 deletions(-)
Signature · 1 line
2.20.1
Jerome Brunet
reviewerPATCH 1/2 arm64: dts: meson: g12a: fix clk_msr node
The clk-msr node should be in cbus.
--- arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/amlogic/meson-g12a.dtsi +4 -4
@@ -217,11 +217,11 @@ #address-cells = <2>; #size-cells = <2>; ranges = <0x0 0x0 0x0 0xffd00000 0x0 0x100000>; - }; - clk_msr: clock-measure@ffd18000 { - compatible = "amlogic,meson-g12a-clk-measure"; - reg = <0x0 0xffd18000 0x0 0x10>; + clk_msr: clock-measure@18000 { + compatible = "amlogic,meson-g12a-clk-measure"; + reg = <0x0 0x18000 0x0 0x10>; + }; }; };
Signature · 1 line
2.20.1
Kevin Hilman
maintainerRe: [PATCH 1/2] arm64: dts: meson: g12a: fix clk_msr node
Quoted 4 lines · Jerome Brunet
The clk-msr node should be in cbus.
Fixes eeca2cf15e05 ("arm64: dts: meson: g12a: add clk measure support")Signed-off-by Jerome Brunet <[email protected]>
This one I squashed with the original (in branch v5.1/dt64)
Kevin
Jerome Brunet
reviewerPATCH 2/2 soc: amlogic: clk-measure: fix-up some clock definitions
In reply to Jerome BrunetAs pointed out in review, a few clock are not properly defined.
---
drivers/soc/amlogic/meson-clk-measure.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/soc/amlogic/meson-clk-measure.c +5 -3
@@ -202,7 +202,7 @@ static struct meson_msr_id clk_msr_axg[CLK_MSR_MAX] = {CLK_MSR_ID (71 ,"audio_slv_sclk_a" ),CLK_MSR_ID (72 ,"pwm_d" ),CLK_MSR_ID (73 ,"pwm_c" ), -CLK_MSR_ID (73 ,"wifi_beacon" ), +CLK_MSR_ID (74 ,"wifi_beacon" ),CLK_MSR_ID (75 ,"tdmin_lb_lrcl" ),CLK_MSR_ID (76 ,"tdmin_lb_sclk" ), CLK_MSR_ID(77, "rng_ring_osc_0"),
@@ -268,6 +268,8 @@ static struct meson_msr_id clk_msr_g12a[CLK_MSR_MAX] = {CLK_MSR_ID (26 ,"sc_int" ),CLK_MSR_ID (27 ,"in_mac" ),CLK_MSR_ID (28 ,"sar_adc" ), +CLK_MSR_ID (29 ,"pcie_inp" ), +CLK_MSR_ID (30 ,"pcie_inn" ),CLK_MSR_ID (31 ,"mpll_test_out" ),CLK_MSR_ID (32 ,"vdec" ), CLK_MSR_ID(33, "sys_cpu_ring_osc_1"),
@@ -303,8 +305,8 @@ static struct meson_msr_id clk_msr_g12a[CLK_MSR_MAX] = {CLK_MSR_ID (65 ,"spicc_0" ),CLK_MSR_ID (66 ,"vid_lock" ),CLK_MSR_ID (67 ,"dsi_phy" ), -CLK_MSR_ID (68 ,"hdcp22_skp" ), -CLK_MSR_ID (69 ,"hdcp22_esm" ), +CLK_MSR_ID (68 ,"hdcp22_esm" ), +CLK_MSR_ID (69 ,"hdcp22_skp" ),CLK_MSR_ID (70 ,"pwm_f" ),CLK_MSR_ID (71 ,"pwm_e" ), CLK_MSR_ID(72, "pwm_d"),
Signature · 1 line
2.20.1
Kevin Hilman
maintainerRe: [PATCH 2/2] soc: amlogic: clk-measure: fix-up some clock definitions
Quoted 5 lines · Jerome Brunet
As pointed out in review, a few clock are not properly defined.
Reported-by Martin Blumenstingl <[email protected]>Fixes 2a4c63e080cd ("soc: amlogic: clk-measure: add axg and g12a support")Signed-off-by Jerome Brunet <[email protected]>
I squashed this with the original too.
In doing so, I noticed I (mis)applied this to my dt64 branch, so while sqaushing, I also moved it to my drivers branch.
Thanks,
Kevin