Linux-Amlogic Archive on lore.kernel.org
 help / Atom feed
* [PATCH 0/2] soc: amlogic: fixup clock measure
@ 2019-02-07 13:26 Jerome Brunet
  2019-02-07 13:26 ` [PATCH 1/2] arm64: dts: meson: g12a: fix clk_msr node Jerome Brunet
  2019-02-07 13:26 ` [PATCH 2/2] soc: amlogic: clk-measure: fix-up some clock definitions Jerome Brunet
  0 siblings, 2 replies; 5+ messages in thread
From: Jerome Brunet @ 2019-02-07 13:26 UTC (permalink / raw)
  To: Kevin Hilman
  Cc: linux-amlogic, devicetree, linux-kernel, linux-arm-kernel, Jerome Brunet

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(-)

-- 
2.20.1


_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 1/2] arm64: dts: meson: g12a: fix clk_msr node
  2019-02-07 13:26 [PATCH 0/2] soc: amlogic: fixup clock measure Jerome Brunet
@ 2019-02-07 13:26 ` Jerome Brunet
  2019-02-08  0:49   ` Kevin Hilman
  2019-02-07 13:26 ` [PATCH 2/2] soc: amlogic: clk-measure: fix-up some clock definitions Jerome Brunet
  1 sibling, 1 reply; 5+ messages in thread
From: Jerome Brunet @ 2019-02-07 13:26 UTC (permalink / raw)
  To: Kevin Hilman
  Cc: linux-amlogic, devicetree, linux-kernel, linux-arm-kernel, 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 <jbrunet@baylibre.com>
---
 arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
index c9d53103a58b..05ea750b8c16 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
@@ -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>;
+			};
 		};
 	};
 
-- 
2.20.1


_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 2/2] soc: amlogic: clk-measure: fix-up some clock definitions
  2019-02-07 13:26 [PATCH 0/2] soc: amlogic: fixup clock measure Jerome Brunet
  2019-02-07 13:26 ` [PATCH 1/2] arm64: dts: meson: g12a: fix clk_msr node Jerome Brunet
@ 2019-02-07 13:26 ` Jerome Brunet
  2019-02-08  0:52   ` Kevin Hilman
  1 sibling, 1 reply; 5+ messages in thread
From: Jerome Brunet @ 2019-02-07 13:26 UTC (permalink / raw)
  To: Kevin Hilman
  Cc: devicetree, Martin Blumenstingl, linux-kernel, linux-amlogic,
	linux-arm-kernel, Jerome Brunet

As pointed out in review, a few clock are not properly defined.

Reported-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Fixes: 2a4c63e080cd ("soc: amlogic: clk-measure: add axg and g12a support")
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---

 drivers/soc/amlogic/meson-clk-measure.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/soc/amlogic/meson-clk-measure.c b/drivers/soc/amlogic/meson-clk-measure.c
index 5570180b94a1..19d4cbc93a17 100644
--- a/drivers/soc/amlogic/meson-clk-measure.c
+++ b/drivers/soc/amlogic/meson-clk-measure.c
@@ -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"),
-- 
2.20.1


_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/2] arm64: dts: meson: g12a: fix clk_msr node
  2019-02-07 13:26 ` [PATCH 1/2] arm64: dts: meson: g12a: fix clk_msr node Jerome Brunet
@ 2019-02-08  0:49   ` Kevin Hilman
  0 siblings, 0 replies; 5+ messages in thread
From: Kevin Hilman @ 2019-02-08  0:49 UTC (permalink / raw)
  To: Jerome Brunet
  Cc: linux-amlogic, devicetree, linux-kernel, linux-arm-kernel, Jerome Brunet

Jerome Brunet <jbrunet@baylibre.com> writes:

> The clk-msr node should be in cbus.
>
> Fixes: eeca2cf15e05 ("arm64: dts: meson: g12a: add clk measure support")
> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>

This one I squashed with the original (in branch v5.1/dt64)

Kevin

_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 2/2] soc: amlogic: clk-measure: fix-up some clock definitions
  2019-02-07 13:26 ` [PATCH 2/2] soc: amlogic: clk-measure: fix-up some clock definitions Jerome Brunet
@ 2019-02-08  0:52   ` Kevin Hilman
  0 siblings, 0 replies; 5+ messages in thread
From: Kevin Hilman @ 2019-02-08  0:52 UTC (permalink / raw)
  To: Jerome Brunet
  Cc: devicetree, Martin Blumenstingl, linux-kernel, linux-amlogic,
	linux-arm-kernel, Jerome Brunet

Jerome Brunet <jbrunet@baylibre.com> writes:

> As pointed out in review, a few clock are not properly defined.
>
> Reported-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
> Fixes: 2a4c63e080cd ("soc: amlogic: clk-measure: add axg and g12a support")
> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>

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

_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, back to index

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-07 13:26 [PATCH 0/2] soc: amlogic: fixup clock measure Jerome Brunet
2019-02-07 13:26 ` [PATCH 1/2] arm64: dts: meson: g12a: fix clk_msr node Jerome Brunet
2019-02-08  0:49   ` Kevin Hilman
2019-02-07 13:26 ` [PATCH 2/2] soc: amlogic: clk-measure: fix-up some clock definitions Jerome Brunet
2019-02-08  0:52   ` Kevin Hilman

Linux-Amlogic Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-amlogic/0 linux-amlogic/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-amlogic linux-amlogic/ https://lore.kernel.org/linux-amlogic \
		linux-amlogic@lists.infradead.org linux-amlogic@archiver.kernel.org
	public-inbox-index linux-amlogic


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.infradead.lists.linux-amlogic


AGPL code for this site: git clone https://public-inbox.org/ public-inbox