* [PATCH v3 1/2] media: Documentation: ccs: Fix the op_pll_multiplier address
@ 2021-04-21 21:33 Bernhard Wimmer
2021-04-21 21:33 ` [PATCH 2/2] media: " Bernhard Wimmer
0 siblings, 1 reply; 3+ messages in thread
From: Bernhard Wimmer @ 2021-04-21 21:33 UTC (permalink / raw)
To: linux-media; +Cc: sakari.ailus, Bernhard Wimmer
According to the CCS spec the op_pll_multiplier address is 0x030e,
not 0x031e.
Signed-off-by: Bernhard Wimmer <be.wimm@gmail.com>
---
Changes in v3:
- split into two separate commits
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 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Documentation/driver-api/media/drivers/ccs/ccs-regs.asc b/Documentation/driver-api/media/drivers/ccs/ccs-regs.asc
index f2042acc8a45..bbf9213c3388 100644
--- a/Documentation/driver-api/media/drivers/ccs/ccs-regs.asc
+++ b/Documentation/driver-api/media/drivers/ccs/ccs-regs.asc
@@ -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
diff --git a/Documentation/driver-api/media/drivers/ccs/mk-ccs-regs b/Documentation/driver-api/media/drivers/ccs/mk-ccs-regs
index 6668deaf2f19..2a4edc7e051a 100755
--- a/Documentation/driver-api/media/drivers/ccs/mk-ccs-regs
+++ b/Documentation/driver-api/media/drivers/ccs/mk-ccs-regs
@@ -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($) {
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] media: ccs: Fix the op_pll_multiplier address
2021-04-21 21:33 [PATCH v3 1/2] media: Documentation: ccs: Fix the op_pll_multiplier address Bernhard Wimmer
@ 2021-04-21 21:33 ` Bernhard Wimmer
2021-04-22 20:26 ` Sakari Ailus
0 siblings, 1 reply; 3+ messages in thread
From: Bernhard Wimmer @ 2021-04-21 21:33 UTC (permalink / raw)
To: linux-media; +Cc: sakari.ailus, Bernhard Wimmer
According to the CCS spec the op_pll_multiplier address is 0x030e,
not 0x031e.
Signed-off-by: Bernhard Wimmer <be.wimm@gmail.com>
---
Changes in v3:
- split into two separate commits
Changes in v2:
- reflow 'generated by ...' line
- adjust commit message line break
drivers/media/i2c/ccs/ccs-limits.c | 4 ++++
drivers/media/i2c/ccs/ccs-limits.h | 4 ++++
drivers/media/i2c/ccs/ccs-regs.h | 6 +++++-
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/drivers/media/i2c/ccs/ccs-limits.c b/drivers/media/i2c/ccs/ccs-limits.c
index f5511789ac83..4969fa425317 100644
--- a/drivers/media/i2c/ccs/ccs-limits.c
+++ b/drivers/media/i2c/ccs/ccs-limits.c
@@ -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"
diff --git a/drivers/media/i2c/ccs/ccs-limits.h b/drivers/media/i2c/ccs/ccs-limits.h
index 1efa43c23a2e..551d3ee9d04e 100644
--- a/drivers/media/i2c/ccs/ccs-limits.h
+++ b/drivers/media/i2c/ccs/ccs-limits.h
@@ -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__
diff --git a/drivers/media/i2c/ccs/ccs-regs.h b/drivers/media/i2c/ccs/ccs-regs.h
index 4b3e5df2121f..6ce84c5ecf20 100644
--- a/drivers/media/i2c/ccs/ccs-regs.h
+++ b/drivers/media/i2c/ccs/ccs-regs.h
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] media: ccs: Fix the op_pll_multiplier address
2021-04-21 21:33 ` [PATCH 2/2] media: " Bernhard Wimmer
@ 2021-04-22 20:26 ` Sakari Ailus
0 siblings, 0 replies; 3+ messages in thread
From: Sakari Ailus @ 2021-04-22 20:26 UTC (permalink / raw)
To: Bernhard Wimmer; +Cc: linux-media
On Wed, Apr 21, 2021 at 11:33:20PM +0200, Bernhard Wimmer wrote:
> According to the CCS spec the op_pll_multiplier address is 0x030e,
> not 0x031e.
>
> Signed-off-by: Bernhard Wimmer <be.wimm@gmail.com>
Thanks, Bernhard!
I've added these two tags to the patch, to get it merged to the stable
kernels:
Cc: stable@vger.kernel.org
Fixes: 6493c4b777c2 ("media: smiapp: Import CCS definitions")
--
Sakari Ailus
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-04-22 20:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-21 21:33 [PATCH v3 1/2] media: Documentation: ccs: Fix the op_pll_multiplier address Bernhard Wimmer
2021-04-21 21:33 ` [PATCH 2/2] media: " Bernhard Wimmer
2021-04-22 20:26 ` Sakari Ailus
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.