media: Documentation: ccs: Fix the op_pll_multiplier address
Subsystems (2)
PATCH v3 1/2 media: Documentation: ccs: Fix the op_pll_multiplier address
According to the CCS spec the op_pll_multiplier address is 0x030e, not 0x031e.
---
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(-)
Documentation/driver-api/media/drivers/ccs/ccs-regs.asc +1 -1
@@ -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
@@ -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($) {
Signature · 1 line
2.17.1
PATCH 2/2 media: ccs: Fix the op_pll_multiplier address
According to the CCS spec the op_pll_multiplier address is 0x030e, not 0x031e.
---
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(-)
drivers/media/i2c/ccs/ccs-limits.c +4 -0
@@ -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
@@ -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
@@ -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
Re: [PATCH 2/2] media: ccs: Fix the op_pll_multiplier address
Quoted 4 lines · Bernhard Wimmer
According to the CCS spec the
op_pll_multiplieraddress is0x030e, not0x031e.Signed-off-by Bernhard Wimmer <[email protected]>
Thanks, Bernhard!
I've added these two tags to the patch, to get it merged to the stable kernels:
Signature · 1 line
Sakari Ailus