Skip to contentSkip to conversation

media: ccs: Fix the op_pll_multiplier address

PATCH Superseded Bernhard Wimmer 2 participants 4 messages Apr 14, 2021 – Apr 21, 2021

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 media: ccs: Fix the op_pll_multiplier address

According to the CCS spec the op_pll_multiplier address is 0x030e, not 0x031e.

---
Changes in v2:
- reflow 'generated by ...' line
- adjust commit message line break

 Documentation/driver-api/media/drivers/ccs/ccs-regs.asc | 2 +-
 Documentation/driver-api/media/drivers/ccs/mk-ccs-regs  | 5 +++--
 drivers/media/i2c/ccs/ccs-limits.c                      | 4 ++++
 drivers/media/i2c/ccs/ccs-limits.h                      | 4 ++++
 drivers/media/i2c/ccs/ccs-regs.h                        | 6 +++++-
 5 files changed, 17 insertions(+), 4 deletions(-)
Documentation/driver-api/media/drivers/ccs/ccs-regs.asc +1 -1
index f2042acc8a45..bbf9213c3388 100644
@@ -210,7 +210,7 @@ pll_multiplier				0x0306	16
 op_pix_clk_div				0x0308	16
 op_sys_clk_div				0x030a	16
 op_pre_pll_clk_div			0x030c	16
-op_pll_multiplier			0x031e	16
+op_pll_multiplier			0x030e	16
 pll_mode				0x0310	8
 - f					0	0
 - e	single				0
Documentation/driver-api/media/drivers/ccs/mk-ccs-regs +3 -2
index 6668deaf2f19..2a4edc7e051a 100755
@@ -72,13 +72,14 @@ $uc_header =~ s/[^A-Z0-9]/_/g;
 
 my $copyright = "/* Copyright (C) 2019--2020 Intel Corporation */\n";
 my $license = "SPDX-License-Identifier: GPL-2.0-only OR BSD-3-Clause";
+my $note = "/*\n * Generated by $0;\n * do not modify.\n */\n";
 
 for my $fh ($A, $LC) {
-	print $fh "// $license\n$copyright\n" if defined $fh;
+	print $fh "// $license\n$copyright$note\n" if defined $fh;
 }
 
 for my $fh ($H, $LH) {
-	print $fh "/* $license */\n$copyright\n";
+	print $fh "/* $license */\n$copyright$note\n";
 }
 
 sub bit_def($) {
drivers/media/i2c/ccs/ccs-limits.c +4 -0
index f5511789ac83..4969fa425317 100644
@@ -1,5 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only OR BSD-3-Clause
 /* Copyright (C) 2019--2020 Intel Corporation */
+/*
+ * Generated by Documentation/driver-api/media/drivers/ccs/mk-ccs-regs;
+ * do not modify.
+ */
 
 #include "ccs-limits.h"
 #include "ccs-regs.h"
drivers/media/i2c/ccs/ccs-limits.h +4 -0
index 1efa43c23a2e..551d3ee9d04e 100644
@@ -1,5 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only OR BSD-3-Clause */
 /* Copyright (C) 2019--2020 Intel Corporation */
+/*
+ * Generated by Documentation/driver-api/media/drivers/ccs/mk-ccs-regs;
+ * do not modify.
+ */
 
 #ifndef __CCS_LIMITS_H__
 #define __CCS_LIMITS_H__
drivers/media/i2c/ccs/ccs-regs.h +5 -1
index 4b3e5df2121f..6ce84c5ecf20 100644
@@ -1,5 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only OR BSD-3-Clause */
 /* Copyright (C) 2019--2020 Intel Corporation */
+/*
+ * Generated by Documentation/driver-api/media/drivers/ccs/mk-ccs-regs;
+ * do not modify.
+ */
 
 #ifndef __CCS_REGS_H__
 #define __CCS_REGS_H__
@@ -202,7 +206,7 @@
 #define CCS_R_OP_PIX_CLK_DIV					(0x0308 | CCS_FL_16BIT)
 #define CCS_R_OP_SYS_CLK_DIV					(0x030a | CCS_FL_16BIT)
 #define CCS_R_OP_PRE_PLL_CLK_DIV				(0x030c | CCS_FL_16BIT)
-#define CCS_R_OP_PLL_MULTIPLIER					(0x031e | CCS_FL_16BIT)
+#define CCS_R_OP_PLL_MULTIPLIER					(0x030e | CCS_FL_16BIT)
 #define CCS_R_PLL_MODE						0x0310
 #define CCS_PLL_MODE_SHIFT					0U
 #define CCS_PLL_MODE_MASK					0x1
Signature · 1 line
2.17.1
#1 lore raw

Hi Bernhard,

Thanks for the patch.

Quoted 4 lines · Bernhard Wimmer

According to the CCS spec the op_pll_multiplier address is 0x030e, not 0x031e.

I missed last time that the register file and the driver were merged at a different time and the driver fix needs to be backported to the stable tree. Could you split the patch into two, i.e. one that has the changes under Documentation and another one in drivers?

I can do that too, just let me know.

Thanks.

Signature · 3 lines
Kind regards,

Sakari Ailus
#2 lore raw

Hi,

Quoted 8 lines · Sakari Ailus

Hi Bernhard,

Thanks for the patch.

Quoted 3 lines · Bernhard Wimmer

According to the CCS spec the op_pll_multiplier address is 0x030e, not 0x031e.

Quoted 8 lines
Quoted 1 line

I missed last time that the register file and the driver were merged at a different time and the driver fix needs to be backported to the stable tree. Could you split the patch into two, i.e. one that has the changes under Documentation and another one in drivers?

I can do that too, just let me know.

I'm not entirely sure what tags or commits these patches should apply to, so it's probably faster if you do it.

Alternatively if you can point me in the right direction then I'm happy to do it (hopefully without too much spam on the mailing list).

Quoted 3 lines

Thanks.

#3 lore raw

Hi Bernhard,

Quoted 18 lines · Bernhard Wimmer

Hi,

Quoted 15 lines · Sakari Ailus

Hi Bernhard,

Thanks for the patch.

Quoted 4 lines · Bernhard Wimmer

According to the CCS spec the op_pll_multiplier address is 0x030e, not 0x031e.

I missed last time that the register file and the driver were merged at a different time and the driver fix needs to be backported to the stable tree. Could you split the patch into two, i.e. one that has the changes under Documentation and another one in drivers?

Quoted 7 lines
Quoted 1 line

I can do that too, just let me know.

I'm not entirely sure what tags or commits these patches should apply to, so it's probably faster if you do it.

Alternatively if you can point me in the right direction then I'm happy to do it (hopefully without too much spam on the mailing list).

I can put the necessary tags in place when I pick up the patches.

The result should be two patches, one with changes under the Documentation directory and another with the changes under drivers directory. Possibly the driver patch could mention ge-generation of the files.

The patch touching the Documentation directory should have "Documentation: " prepended to the subject line.

Signature · 3 lines
Kind regards,

Sakari Ailus