* Re: [PATCH 10/16] media: sun6i-csi: Add support for MC-centric format enumeration
From: arash golgol @ 2026-05-27 5:50 UTC (permalink / raw)
To: Paul Kocialkowski
Cc: linux-media, linux-arm-kernel, linux-sunxi, linux-kernel,
linux-staging, Mauro Carvalho Chehab, Chen-Yu Tsai,
Jernej Skrabec, Samuel Holland, Greg Kroah-Hartman,
Laurent Pinchart, Nicolas Dufresne
In-Reply-To: <20260518102451.417971-11-paulk@sys-base.io>
Hi Paul,
On Mon, May 18, 2026 at 2:00 PM Paul Kocialkowski <paulk@sys-base.io> wrote:
>
> Use the dedicated helper to check possible pixelformats against the
> provided mbus code in order to support MC-centric format enumeration.
>
> Note that multiple pixelformats may be returned for a given mbus code.
>
> Signed-off-by: Paul Kocialkowski <paulk@sys-base.io>
> ---
> .../sunxi/sun6i-csi/sun6i_csi_capture.c | 38 +++++++++++++++++--
> 1 file changed, 34 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c
> index a836fa7f081a..409c28621093 100644
> --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c
> +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c
> @@ -773,14 +773,43 @@ static int sun6i_csi_capture_querycap(struct file *file, void *priv,
> static int sun6i_csi_capture_enum_fmt(struct file *file, void *priv,
> struct v4l2_fmtdesc *fmtdesc)
> {
> + const struct sun6i_csi_capture_format *capture_format;
> + const struct sun6i_csi_bridge_format *bridge_format;
> + u32 mbus_code = fmtdesc->mbus_code;
> u32 index = fmtdesc->index;
> + unsigned int index_valid = 0;
> + unsigned int i;
> +
> + /* Video-node-centric enumeration. */
> + if (!mbus_code) {
> + if (index >= ARRAY_SIZE(sun6i_csi_capture_formats))
> + return -EINVAL;
> +
> + fmtdesc->pixelformat =
> + sun6i_csi_capture_formats[index].pixelformat;
> + return 0;
> + }
>
> - if (index >= ARRAY_SIZE(sun6i_csi_capture_formats))
> + bridge_format = sun6i_csi_bridge_format_find(mbus_code);
> + if (!bridge_format)
> return -EINVAL;
>
> - fmtdesc->pixelformat = sun6i_csi_capture_formats[index].pixelformat;
> + for (i = 0; i < ARRAY_SIZE(sun6i_csi_capture_formats); i++) {
> + capture_format = &sun6i_csi_capture_formats[i];
>
> - return 0;
> + if (!sun6i_csi_capture_format_check(capture_format,
> + bridge_format))
> + continue;
> +
> + if (index_valid == index) {
> + fmtdesc->pixelformat = capture_format->pixelformat;
> + return 0;
> + }
> +
> + index_valid++;
> + }
> +
> + return -EINVAL;
> }
>
> static int sun6i_csi_capture_enum_framesize(struct file *file, void *fh,
> @@ -1076,7 +1105,8 @@ int sun6i_csi_capture_setup(struct sun6i_csi_device *csi_dev)
>
> strscpy(video_dev->name, SUN6I_CSI_CAPTURE_NAME,
> sizeof(video_dev->name));
> - video_dev->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
> + video_dev->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING |
> + V4L2_CAP_IO_MC;
> video_dev->vfl_dir = VFL_DIR_RX;
> video_dev->release = video_device_release_empty;
> video_dev->fops = &sun6i_csi_capture_fops;
> --
> 2.54.0
>
Tested on a LicheePi Zero Dock (V3s) with the following pipeline:
ov7670 -> sun6i-csi-bridge -> sun6i-csi-capture
I verified that mbus-code-based format enumeration works correctly
from userspace and that the reported capture formats change according
to the selected media bus format.
I could also successfully start streaming with several of the
enumerated capture formats (e.g. YUYV and BA81)
However, I could not fully validate actual format conversion behavior
(e.g. MEDIA_BUS_FMT_YUYV8_2X8 to NV12) because my OV7670 setup
currently has non-functional test patterns except for 'shifting-1'
mode.
Tested-by: Arash Golgol <arash.golgol@gmail.com>
PS:
While testing this patch I also noticed that
VIDIOC_SUBDEV_ENUM_MBUS_CODE reports duplicate entries for:
- MEDIA_BUS_FMT_UYVY8_2X8
- MEDIA_BUS_FMT_UYVY8_1X16
on sun6i-csi-bridge.
This appears to come from duplicate format entries being exposed by
the bridge driver.
--
Regards,
Arash Golgol
^ permalink raw reply
* Re: [PATCH] staging: media: atomisp: fix typo in rx.c
From: Andy Shevchenko @ 2026-05-27 5:32 UTC (permalink / raw)
To: Marlon Trujillo
Cc: hansg, mchehab, gregkh, sakari.ailus, andy, linux-media,
linux-staging, linux-kernel
In-Reply-To: <20260523111511.865-1-marl0rd1080@gmail.com>
On Sat, May 23, 2026 at 1:15 PM Marlon Trujillo <marl0rd1080@gmail.com> wrote:
>
> Fix spelling mistake: inptu -> input
Is this the only one single typo in the whole driver?
> - /* In this module the validity of the inptu variable should
> + /* In this module the validity of the input variable should
> * have been checked already, so we do not check for erroneous
> * values. */
/*
* While at it, fix the multi-line comment
* style as shown in this example.
*/
But before doing that, invest your time into reading linux-media@
mailing list archive and see what others already sent
(lore.kernel.org/linux-media).
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply
* Re: [PATCH v2] media: atomisp: remove function name from dev_dbg calls
From: Andy Shevchenko @ 2026-05-27 5:26 UTC (permalink / raw)
To: Jeongin Yeo
Cc: hansg, mchehab, gregkh, sakari.ailus, andy, matt, linux-media,
linux-staging, linux-kernel
In-Reply-To: <20260526200222.330280-1-jeongin.yeo@luaberry.com>
On Tue, May 26, 2026 at 10:03 PM Jeongin Yeo <jeongin.yeo@luaberry.com> wrote:
>
> Remove the hardcoded function name prefix from dev_dbg() output
> strings within ia_css_binary_find(). dev_dbg() can already emit
> the function name via dynamic_debug's 'f' flag, so embedding it
> in the format string is redundant.
>
> This resolves the EMBEDDED_FUNCTION_NAME checkpatch warnings without
> introducing __func__ to format strings.
>
> No functional changes.
...
> dev_dbg(atomisp_dev,
> - "ia_css_binary_find() [%d] continue: !%d && %d && (%d != %d)\n",
> + "[%d] continue: !%d && %d && (%d != %d)\n",
> __LINE__, candidate->enable.continuous,
> continuous, mode, IA_CSS_BINARY_MODE_COPY);
__LINE__ is also provided.
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply
* [PATCH] MAINTAINERS: Remove bouncing Intel media maintainers
From: Dave Hansen @ 2026-05-26 21:41 UTC (permalink / raw)
To: linux-kernel
Cc: Dave Hansen, Yong Zhi, Sakari Ailus, Dan Scally,
Mauro Carvalho Chehab, Greg Kroah-Hartman, Lixu Zhang,
linux-media, linux-staging
Tianshu Qiu and Bingbu Cao are maintainers and reviewers of a bunch of
media drivers (7 and 9 respectively). Both of their emails are
bouncing.
Remove the bouncing entries and update driver status in cases where
there are no M:'s left.
Mauro, I was hoping this was the kind of thing you could take directly
since it touches so many different drivers.
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Yong Zhi <yong.zhi@intel.com>
Cc: Sakari Ailus <sakari.ailus@linux.intel.com>
Cc: Dan Scally <dan.scally@ideasonboard.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Lixu Zhang <lixu.zhang@intel.com>
Cc: linux-media@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-staging@lists.linux.dev
---
MAINTAINERS | 28 ++++++----------------------
1 file changed, 6 insertions(+), 22 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index ac9a298b811e0..6646c00dade96 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3857,9 +3857,8 @@ F: Documentation/devicetree/bindings/leds/ams,as3668.yaml
F: drivers/leds/leds-as3668.c
ASAHI KASEI AK7375 LENS VOICE COIL DRIVER
-M: Tianshu Qiu <tian.shu.qiu@intel.com>
L: linux-media@vger.kernel.org
-S: Maintained
+S: Orphan
T: git git://linuxtv.org/media.git
F: Documentation/devicetree/bindings/media/i2c/asahi-kasei,ak7375.yaml
F: drivers/media/i2c/ak7375.c
@@ -13003,9 +13002,7 @@ F: drivers/iommu/intel/
INTEL IPU3 CSI-2 CIO2 DRIVER
M: Yong Zhi <yong.zhi@intel.com>
M: Sakari Ailus <sakari.ailus@linux.intel.com>
-M: Bingbu Cao <bingbu.cao@intel.com>
M: Dan Scally <dan.scally@ideasonboard.com>
-R: Tianshu Qiu <tian.shu.qiu@intel.com>
L: linux-media@vger.kernel.org
S: Maintained
T: git git://linuxtv.org/media.git
@@ -13014,8 +13011,6 @@ F: drivers/media/pci/intel/ipu3/
INTEL IPU3 CSI-2 IMGU DRIVER
M: Sakari Ailus <sakari.ailus@linux.intel.com>
-R: Bingbu Cao <bingbu.cao@intel.com>
-R: Tianshu Qiu <tian.shu.qiu@intel.com>
L: linux-media@vger.kernel.org
S: Maintained
F: Documentation/admin-guide/media/ipu3.rst
@@ -13025,8 +13020,6 @@ F: drivers/staging/media/ipu3/
INTEL IPU6 INPUT SYSTEM DRIVER
M: Sakari Ailus <sakari.ailus@linux.intel.com>
-M: Bingbu Cao <bingbu.cao@intel.com>
-R: Tianshu Qiu <tian.shu.qiu@intel.com>
L: linux-media@vger.kernel.org
S: Maintained
T: git git://linuxtv.org/media.git
@@ -13035,7 +13028,6 @@ F: drivers/media/pci/intel/ipu6/
INTEL IPU7 INPUT SYSTEM DRIVER
M: Sakari Ailus <sakari.ailus@linux.intel.com>
-R: Bingbu Cao <bingbu.cao@intel.com>
L: linux-media@vger.kernel.org
S: Maintained
T: git git://linuxtv.org/media.git
@@ -13337,7 +13329,6 @@ F: drivers/net/wireless/intel/iwlwifi/
INTEL VISION SENSING CONTROLLER DRIVER
M: Sakari Ailus <sakari.ailus@linux.intel.com>
-R: Bingbu Cao <bingbu.cao@intel.com>
R: Lixu Zhang <lixu.zhang@intel.com>
L: linux-media@vger.kernel.org
S: Maintained
@@ -19620,9 +19611,8 @@ F: Documentation/devicetree/bindings/media/i2c/ovti,os05b10.yaml
F: drivers/media/i2c/os05b10.c
OMNIVISION OV01A10 SENSOR DRIVER
-M: Bingbu Cao <bingbu.cao@intel.com>
L: linux-media@vger.kernel.org
-S: Maintained
+S: Orphan
T: git git://linuxtv.org/media.git
F: drivers/media/i2c/ov01a10.c
@@ -19713,11 +19703,9 @@ F: Documentation/devicetree/bindings/media/i2c/ovti,ov2735.yaml
F: drivers/media/i2c/ov2735.c
OMNIVISION OV2740 SENSOR DRIVER
-M: Tianshu Qiu <tian.shu.qiu@intel.com>
R: Sakari Ailus <sakari.ailus@linux.intel.com>
-R: Bingbu Cao <bingbu.cao@intel.com>
L: linux-media@vger.kernel.org
-S: Maintained
+S: Orphan
T: git git://linuxtv.org/media.git
F: drivers/media/i2c/ov2740.c
@@ -19857,10 +19845,8 @@ F: Documentation/devicetree/bindings/media/i2c/ovti,ov9650.txt
F: drivers/media/i2c/ov9650.c
OMNIVISION OV9734 SENSOR DRIVER
-M: Tianshu Qiu <tian.shu.qiu@intel.com>
-R: Bingbu Cao <bingbu.cao@intel.com>
L: linux-media@vger.kernel.org
-S: Maintained
+S: Orphan
T: git git://linuxtv.org/media.git
F: drivers/media/i2c/ov9734.c
@@ -24866,9 +24852,8 @@ F: Documentation/devicetree/bindings/media/i2c/sony,imx296.yaml
F: drivers/media/i2c/imx296.c
SONY IMX319 SENSOR DRIVER
-M: Bingbu Cao <bingbu.cao@intel.com>
L: linux-media@vger.kernel.org
-S: Maintained
+S: Orphan
T: git git://linuxtv.org/media.git
F: drivers/media/i2c/imx319.c
@@ -24888,9 +24873,8 @@ F: Documentation/devicetree/bindings/media/i2c/sony,imx335.yaml
F: drivers/media/i2c/imx335.c
SONY IMX355 SENSOR DRIVER
-M: Tianshu Qiu <tian.shu.qiu@intel.com>
L: linux-media@vger.kernel.org
-S: Maintained
+S: Orphan
T: git git://linuxtv.org/media.git
F: drivers/media/i2c/imx355.c
--
2.43.0
^ permalink raw reply related
* Re: [PATCH v2] staging: sm750fb: fix CamelCase variables name in sm750
From: eamanu @ 2026-05-26 20:30 UTC (permalink / raw)
To: Greg KH
Cc: sudipm.mukherjee, teddy.wang, linux-fbdev, linux-staging,
linux-kernel, kernel test robot
In-Reply-To: <2026052623-cause-region-02e3@gregkh>
Hi,
thanks for your reply
On 2026-05-26 13:20, Greg KH wrote:
> On Tue, May 26, 2026 at 10:16:31AM -0300, Emmanuel Arias wrote:
>> Replace CamelCase variable name with snake_case:
>> - pvReg -> pv_reg
>
> Why are you keeping the "pv_"? What does that mean?
Sorry, I'm trying to start contributing in the kernel. I run
scripts/checkpatch.pl --file drivers/staging/sm750fb/*.c
And the output was:
drivers/staging/sm750fb/sm750.c
-------------------------------
WARNING: static const char * array should probably be static const char
* const
#36: FILE: drivers/staging/sm750fb/sm750.c:36:
+static const char *g_fbmode[] = {NULL, NULL};
CHECK: Avoid CamelCase: <pvReg>
#758: FILE: drivers/staging/sm750fb/sm750.c:758:
+ crtc->cursor.mmio = sm750_dev->pvReg +
CHECK: Avoid CamelCase: <setAllEngOff>
#863: FILE: drivers/staging/sm750fb/sm750.c:863:
+ sm750_dev->init_parm.setAllEngOff = 0;
total: 0 errors, 1 warnings, 2 checks, 1171 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or
--fix-inplace.
So I tried to change pvReg for pv_reg and the same for setAllEngOff.
>
>> - setAllEngOff -> set_all_eng_off
>>
>> Reported-by: kernel test robot <lkp@intel.com>
>
> The test robot told you to make this change?
As I understand the test robot failed because:
drivers/staging/sm750fb/sm750_hw.c: In function 'hw_sm750_map':
>> drivers/staging/sm750fb/sm750_hw.c:43:13: error: 'struct sm750_dev' has no member named 'pvReg'; did you mean 'pv_reg'?
sm750_dev->pvReg =
^~~~~
pv_reg
>
>> Closes: https://lore.kernel.org/oe-kbuild-all/202605171049.KbaBnrJV-lkp@intel.com/
>> Signed-off-by: Emmanuel Arias <eamanu@riseup.net>
>> ---
>> drivers/staging/sm750fb/sm750.c | 6 +++---
>> drivers/staging/sm750fb/sm750.h | 4 ++--
>> drivers/staging/sm750fb/sm750_hw.c | 12 ++++++------
>> 3 files changed, 11 insertions(+), 11 deletions(-)
>
> What changed from v1?
So, in this v2 I added sm750_hw.c.
Please let me know if I misunderstood the workflow
>
> thanks,
>
> greg k-h
Cheers,
Emmanuel
^ permalink raw reply
* [PATCH v2] media: atomisp: remove function name from dev_dbg calls
From: Jeongin Yeo @ 2026-05-26 20:02 UTC (permalink / raw)
To: hansg, mchehab
Cc: gregkh, sakari.ailus, andy, matt, linux-media, linux-staging,
linux-kernel, Jeongin Yeo
Remove the hardcoded function name prefix from dev_dbg() output
strings within ia_css_binary_find(). dev_dbg() can already emit
the function name via dynamic_debug's 'f' flag, so embedding it
in the format string is redundant.
This resolves the EMBEDDED_FUNCTION_NAME checkpatch warnings without
introducing __func__ to format strings.
No functional changes.
Signed-off-by: Jeongin Yeo <jeongin.yeo@luaberry.com>
---
Changes in v2:
- Remove the function name strings entirely instead of converting
them to __func__, per feedback from Greg KH. dev_dbg() can already
emit function names via dynamic_debug's 'f' flag.
- Link to v1: https://lore.kernel.org/r/20260526104750.1284935-1-jeongin.yeo@luaberry.com
.../atomisp/pci/runtime/binary/src/binary.c | 58 +++++++++----------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c b/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
index e9016d7775dc3..22f11155500b1 100644
--- a/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
+++ b/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
@@ -925,7 +925,7 @@ int ia_css_binary_find(struct ia_css_binary_descr *descr, struct ia_css_binary *
/* MW: used after an error check, may accept NULL, but doubtful */
assert(binary);
- dev_dbg(atomisp_dev, "ia_css_binary_find() enter: descr=%p, (mode=%d), binary=%p\n",
+ dev_dbg(atomisp_dev, "enter: descr=%p, (mode=%d), binary=%p\n",
descr, descr->mode, binary);
mode = descr->mode;
@@ -992,7 +992,7 @@ int ia_css_binary_find(struct ia_css_binary_descr *descr, struct ia_css_binary *
/* printf("sh_css_binary_find: evaluating candidate:
* %d\n",candidate->id); */
dev_dbg(atomisp_dev,
- "ia_css_binary_find() candidate = %p, mode = %d ID = %d\n",
+ "candidate = %p, mode = %d ID = %d\n",
candidate, candidate->pipeline.mode, candidate->id);
/*
@@ -1003,14 +1003,14 @@ int ia_css_binary_find(struct ia_css_binary_descr *descr, struct ia_css_binary *
if (!candidate->enable.continuous &&
continuous && (mode != IA_CSS_BINARY_MODE_COPY)) {
dev_dbg(atomisp_dev,
- "ia_css_binary_find() [%d] continue: !%d && %d && (%d != %d)\n",
+ "[%d] continue: !%d && %d && (%d != %d)\n",
__LINE__, candidate->enable.continuous,
continuous, mode, IA_CSS_BINARY_MODE_COPY);
continue;
}
if (striped && candidate->iterator.num_stripes == 1) {
dev_dbg(atomisp_dev,
- "ia_css_binary_find() [%d] continue: binary is not striped\n",
+ "[%d] continue: binary is not striped\n",
__LINE__);
continue;
}
@@ -1019,37 +1019,37 @@ int ia_css_binary_find(struct ia_css_binary_descr *descr, struct ia_css_binary *
(mode != IA_CSS_BINARY_MODE_COPY) &&
(mode != IA_CSS_BINARY_MODE_CAPTURE_PP) &&
(mode != IA_CSS_BINARY_MODE_VF_PP)) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: (%d != %d)\n",
+ dev_dbg(atomisp_dev, "[%d] continue: (%d != %d)\n",
__LINE__, candidate->pipeline.isp_pipe_version, isp_pipe_version);
continue;
}
if (!candidate->enable.reduced_pipe && enable_reduced_pipe) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: !%d && %d\n",
+ dev_dbg(atomisp_dev, "[%d] continue: !%d && %d\n",
__LINE__, candidate->enable.reduced_pipe, enable_reduced_pipe);
continue;
}
if (!candidate->enable.dvs_6axis && enable_dvs_6axis) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: !%d && %d\n",
+ dev_dbg(atomisp_dev, "[%d] continue: !%d && %d\n",
__LINE__, candidate->enable.dvs_6axis, enable_dvs_6axis);
continue;
}
if (candidate->enable.high_speed && !enable_high_speed) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: %d && !%d\n",
+ dev_dbg(atomisp_dev, "[%d] continue: %d && !%d\n",
__LINE__, candidate->enable.high_speed, enable_high_speed);
continue;
}
if (!candidate->enable.xnr && need_xnr) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: %d && !%d\n",
+ dev_dbg(atomisp_dev, "[%d] continue: %d && !%d\n",
__LINE__, candidate->enable.xnr, need_xnr);
continue;
}
if (!(candidate->enable.ds & 2) && enable_yuv_ds) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: !%d && %d\n",
+ dev_dbg(atomisp_dev, "[%d] continue: !%d && %d\n",
__LINE__, ((candidate->enable.ds & 2) != 0), enable_yuv_ds);
continue;
}
if ((candidate->enable.ds & 2) && !enable_yuv_ds) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: %d && !%d\n",
+ dev_dbg(atomisp_dev, "[%d] continue: %d && !%d\n",
__LINE__, ((candidate->enable.ds & 2) != 0), enable_yuv_ds);
continue;
}
@@ -1065,13 +1065,13 @@ int ia_css_binary_find(struct ia_css_binary_descr *descr, struct ia_css_binary *
/* or more than one output pin. */
xcandidate->num_output_pins > 1)) {
dev_dbg(atomisp_dev,
- "ia_css_binary_find() [%d] continue: (%p != NULL) && !(%d || %d || (%d >%d))\n",
+ "[%d] continue: (%p != NULL) && !(%d || %d || (%d >%d))\n",
__LINE__, req_vf_info, candidate->enable.vf_veceven,
candidate->vf_dec.is_variable, xcandidate->num_output_pins, 1);
continue;
}
if (!candidate->enable.dvs_envelope && need_dvs) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: !%d && %d\n",
+ dev_dbg(atomisp_dev, "[%d] continue: !%d && %d\n",
__LINE__, candidate->enable.dvs_envelope, (int)need_dvs);
continue;
}
@@ -1079,37 +1079,37 @@ int ia_css_binary_find(struct ia_css_binary_descr *descr, struct ia_css_binary *
ia_css_binary_internal_res(req_in_info, req_bds_out_info,
req_bin_out_info, &dvs_env, candidate, &internal_res);
if (internal_res.width > candidate->internal.max_width) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: (%d > %d)\n",
+ dev_dbg(atomisp_dev, "[%d] continue: (%d > %d)\n",
__LINE__, internal_res.width, candidate->internal.max_width);
continue;
}
if (internal_res.height > candidate->internal.max_height) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: (%d > %d)\n",
+ dev_dbg(atomisp_dev, "[%d] continue: (%d > %d)\n",
__LINE__, internal_res.height, candidate->internal.max_height);
continue;
}
if (!candidate->enable.ds && need_ds && !(xcandidate->num_output_pins > 1)) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: !%d && %d\n",
+ dev_dbg(atomisp_dev, "[%d] continue: !%d && %d\n",
__LINE__, candidate->enable.ds, (int)need_ds);
continue;
}
if (!candidate->enable.uds && !candidate->enable.dvs_6axis && need_dz) {
dev_dbg(atomisp_dev,
- "ia_css_binary_find() [%d] continue: !%d && !%d && %d\n",
+ "[%d] continue: !%d && !%d && %d\n",
__LINE__, candidate->enable.uds, candidate->enable.dvs_6axis,
(int)need_dz);
continue;
}
if (online && candidate->input.source == IA_CSS_BINARY_INPUT_MEMORY) {
dev_dbg(atomisp_dev,
- "ia_css_binary_find() [%d] continue: %d && (%d == %d)\n",
+ "[%d] continue: %d && (%d == %d)\n",
__LINE__, online, candidate->input.source,
IA_CSS_BINARY_INPUT_MEMORY);
continue;
}
if (!online && candidate->input.source == IA_CSS_BINARY_INPUT_SENSOR) {
dev_dbg(atomisp_dev,
- "ia_css_binary_find() [%d] continue: !%d && (%d == %d)\n",
+ "[%d] continue: !%d && (%d == %d)\n",
__LINE__, online, candidate->input.source,
IA_CSS_BINARY_INPUT_SENSOR);
continue;
@@ -1117,7 +1117,7 @@ int ia_css_binary_find(struct ia_css_binary_descr *descr, struct ia_css_binary *
if (req_bin_out_info->res.width < candidate->output.min_width ||
req_bin_out_info->res.width > candidate->output.max_width) {
dev_dbg(atomisp_dev,
- "ia_css_binary_find() [%d] continue: (%d > %d) || (%d < %d)\n",
+ "[%d] continue: (%d > %d) || (%d < %d)\n",
__LINE__, req_bin_out_info->padded_width,
candidate->output.min_width, req_bin_out_info->padded_width,
candidate->output.max_width);
@@ -1128,19 +1128,19 @@ int ia_css_binary_find(struct ia_css_binary_descr *descr, struct ia_css_binary *
req_vf_info) { /* and we need vf output. */
if (req_vf_info->res.width > candidate->output.max_width) {
dev_dbg(atomisp_dev,
- "ia_css_binary_find() [%d] continue: (%d < %d)\n",
+ "[%d] continue: (%d < %d)\n",
__LINE__, req_vf_info->res.width,
candidate->output.max_width);
continue;
}
}
if (req_in_info->padded_width > candidate->input.max_width) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: (%d > %d)\n",
+ dev_dbg(atomisp_dev, "[%d] continue: (%d > %d)\n",
__LINE__, req_in_info->padded_width, candidate->input.max_width);
continue;
}
if (!binary_supports_output_format(xcandidate, req_bin_out_info->format)) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: !%d\n",
+ dev_dbg(atomisp_dev, "[%d] continue: !%d\n",
__LINE__, binary_supports_output_format(xcandidate,
req_bin_out_info->format));
continue;
@@ -1152,7 +1152,7 @@ int ia_css_binary_find(struct ia_css_binary_descr *descr, struct ia_css_binary *
is supported. */
!binary_supports_output_format(xcandidate, req_vf_info->format)) {
dev_dbg(atomisp_dev,
- "ia_css_binary_find() [%d] continue: (%d > %d) && (%p != NULL) && !%d\n",
+ "[%d] continue: (%d > %d) && (%p != NULL) && !%d\n",
__LINE__, xcandidate->num_output_pins, 1, req_vf_info,
binary_supports_output_format(xcandidate, req_vf_info->format));
continue;
@@ -1163,7 +1163,7 @@ int ia_css_binary_find(struct ia_css_binary_descr *descr, struct ia_css_binary *
req_vf_info && candidate->enable.vf_veceven &&
!binary_supports_vf_format(xcandidate, req_vf_info->format)) {
dev_dbg(atomisp_dev,
- "ia_css_binary_find() [%d] continue: (%d == %d) && (%p != NULL) && %d && !%d\n",
+ "[%d] continue: (%d == %d) && (%p != NULL) && %d && !%d\n",
__LINE__, xcandidate->num_output_pins, 1,
req_vf_info, candidate->enable.vf_veceven,
binary_supports_vf_format(xcandidate, req_vf_info->format));
@@ -1175,7 +1175,7 @@ int ia_css_binary_find(struct ia_css_binary_descr *descr, struct ia_css_binary *
req_vf_info && candidate->enable.vf_veceven) { /* and we need vf output. */
if (req_vf_info->res.width > candidate->output.max_width) {
dev_dbg(atomisp_dev,
- "ia_css_binary_find() [%d] continue: (%d < %d)\n",
+ "[%d] continue: (%d < %d)\n",
__LINE__, req_vf_info->res.width,
candidate->output.max_width);
continue;
@@ -1184,20 +1184,20 @@ int ia_css_binary_find(struct ia_css_binary_descr *descr, struct ia_css_binary *
if (!supports_bds_factor(candidate->bds.supported_bds_factors,
descr->required_bds_factor)) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: 0x%x & 0x%x)\n",
+ dev_dbg(atomisp_dev, "[%d] continue: 0x%x & 0x%x)\n",
__LINE__, candidate->bds.supported_bds_factors,
descr->required_bds_factor);
continue;
}
if (!candidate->enable.dpc && need_dpc) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: 0x%x & 0x%x)\n",
+ dev_dbg(atomisp_dev, "[%d] continue: 0x%x & 0x%x)\n",
__LINE__, candidate->enable.dpc, descr->enable_dpc);
continue;
}
if (candidate->uds.use_bci && enable_capture_pp_bli) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: 0x%x & 0x%x)\n",
+ dev_dbg(atomisp_dev, "[%d] continue: 0x%x & 0x%x)\n",
__LINE__, candidate->uds.use_bci, descr->enable_capture_pp_bli);
continue;
}
--
2.43.0
^ permalink raw reply related
* [PATCH] staging: rtl8723bs: fix spelling mistakes found by codespell
From: Tomasz Unger @ 2026-05-26 18:52 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-staging, linux-kernel, Tomasz Unger
In-Reply-To: <20260526-fix-typos-hal-com-reg-v1-1-9deb54e6e2e8.ref@yahoo.pl>
Corrected typos in comments:
- contrl -> control
- Redifine -> Redefine
- pauload -> payload
Found by codespell.
Signed-off-by: Tomasz Unger <tomasz.unger@yahoo.pl>
---
drivers/staging/rtl8723bs/include/hal_com_reg.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/rtl8723bs/include/hal_com_reg.h b/drivers/staging/rtl8723bs/include/hal_com_reg.h
index 479748d85626..06cbc3f92baf 100644
--- a/drivers/staging/rtl8723bs/include/hal_com_reg.h
+++ b/drivers/staging/rtl8723bs/include/hal_com_reg.h
@@ -20,7 +20,7 @@
#define REG_RSV_CTRL 0x001C
#define REG_RF_CTRL 0x001F
#define REG_AFE_XTAL_CTRL 0x0024
-#define REG_MAC_PHY_CTRL 0x002c /* for 92d, DMDP, SMSP, DMSP contrl */
+#define REG_MAC_PHY_CTRL 0x002c /* for 92d, DMDP, SMSP, DMSP control */
#define REG_EFUSE_CTRL 0x0030
#define REG_EFUSE_TEST 0x0034
#define REG_PWR_DATA 0x0038
@@ -186,7 +186,7 @@
/* */
/* */
-/* Redifine 8192C register definition for compatibility */
+/* Redefine 8192C register definition for compatibility */
/* */
/* */
#define EFUSE_CTRL REG_EFUSE_CTRL /* E-Fuse Control. */
@@ -273,7 +273,7 @@
/* */
/* 8192C (RCR) Receive Configuration Register (Offset 0x608, 32 bits) */
/* */
-#define RCR_APPFCS BIT(31) /* WMAC append FCS after pauload */
+#define RCR_APPFCS BIT(31) /* WMAC append FCS after payload */
#define RCR_APP_MIC BIT(30) /* MACRX will retain the MIC at the bottom of the packet. */
#define RCR_APP_ICV BIT(29) /* MACRX will retain the ICV at the bottom of the packet. */
#define RCR_APP_PHYST_RXFF BIT(28) /* PHY Status is appended before RX packet in RXFF */
---
base-commit: 7cb1c5b32a2bfde961fff8d5204526b609bcb30a
change-id: 20260526-fix-typos-hal-com-reg-3cdcb9e9eb95
Best regards,
--
Tomasz Unger <tomasz.unger@yahoo.pl>
^ permalink raw reply related
* Re: [PATCH] media: atomisp: use __func__ in debug messages in binary.c
From: Jeongin Yeo @ 2026-05-26 19:25 UTC (permalink / raw)
To: Greg KH
Cc: hansg, mchehab, sakari.ailus, andy, matt, linux-media,
linux-staging, linux-kernel
In-Reply-To: <2026052613-glamour-caress-1b8a@gregkh>
On Wed, May 27, 2026, at 1:21 AM, Greg KH wrote:
> dev_dbg() already has __func__ in the output, why is it needed again?
You're right, dynamic_debug's 'f' flag can already emit the function
name, so both __func__ and the "ia_css_binary_find()" prefix were redundant.
I'll send v2 that removes the function name strings entirely instead
of converting them to __func__.
Thanks for the review.
Jeongin Yeo
^ permalink raw reply
* Re: [PATCH v3] staging: media: Remove deprecated Atmel ISC drivers
From: gregkh @ 2026-05-26 16:21 UTC (permalink / raw)
To: Ashwin Gundarapu; +Cc: linux-kernel, linux-media, linux-staging
In-Reply-To: <19e64377600.72fca248167943.7947263371163961978@zohomail.in>
On Tue, May 26, 2026 at 05:46:56PM +0530, Ashwin Gundarapu wrote:
> The Atmel ISC and XISC drivers were deprecated and scheduled
> for removal by the beginning of 2026. The replacement drivers
> (VIDEO_MICROCHIP_ISC and VIDEO_MICROCHIP_XISC) are available
> in the main media subsystem.
>
> Remove the Kconfig entries, Makefile rules, MAINTAINERS entries,
> and the STAGING_MEDIA_DEPRECATED menuconfig since it is no longer
> needed. The source files remain on disk but are no longer compiled
> since the build infrastructure is removed.
>
> Signed-off-by: Ashwin Gundarapu <linuxuser509@zohomail.in>
> ---
> MAINTAINERS | 2 -
> drivers/staging/media/Kconfig | 18 +------
> drivers/staging/media/Makefile | 1 -
> .../staging/media/deprecated/atmel/Kconfig | 47 -------------------
> .../staging/media/deprecated/atmel/Makefile | 8 ----
> 5 files changed, 1 insertion(+), 75 deletions(-)
> delete mode 100644 drivers/staging/media/deprecated/atmel/Kconfig
> delete mode 100644 drivers/staging/media/deprecated/atmel/Makefile
Hi,
This is the friendly patch-bot of Greg Kroah-Hartman. You have sent him
a patch that has triggered this response. He used to manually respond
to these common problems, but in order to save his sanity (he kept
writing the same thing over and over, yet to different people), I was
created. Hopefully you will not take offence and will fix the problem
in your patch and resubmit it so that it can be accepted into the Linux
kernel tree.
You are receiving this message because of the following common error(s)
as indicated below:
- This looks like a new version of a previously submitted patch, but you
did not list below the --- line any changes from the previous version.
Please read the section entitled "The canonical patch format" in the
kernel file, Documentation/process/submitting-patches.rst for what
needs to be done here to properly describe this.
If you wish to discuss this problem further, or you have questions about
how to resolve this issue, please feel free to respond to this email and
Greg will reply once he has dug out from the pending patches received
from other developers.
thanks,
greg k-h's patch email bot
^ permalink raw reply
* Re: [PATCH] media: atomisp: use __func__ in debug messages in binary.c
From: Greg KH @ 2026-05-26 16:21 UTC (permalink / raw)
To: Jeongin Yeo
Cc: hansg, mchehab, sakari.ailus, andy, matt, linux-media,
linux-staging, linux-kernel
In-Reply-To: <20260526104750.1284935-1-jeongin.yeo@luaberry.com>
On Tue, May 26, 2026 at 10:47:50AM +0000, Jeongin Yeo wrote:
> Replace hardcoded function name strings with __func__ macro in
> dev_dbg() calls within ia_css_binary_find() as recommended by
> kernel coding style.
>
> No functional changes.
>
> Signed-off-by: Jeongin Yeo <jeongin.yeo@luaberry.com>
> ---
> .../atomisp/pci/runtime/binary/src/binary.c | 127 ++++++++++--------
> 1 file changed, 68 insertions(+), 59 deletions(-)
>
> diff --git a/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c b/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
> index e9016d7775dc3..2355fdf357fcd 100644
> --- a/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
> +++ b/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
> @@ -925,8 +925,8 @@ int ia_css_binary_find(struct ia_css_binary_descr *descr, struct ia_css_binary *
> /* MW: used after an error check, may accept NULL, but doubtful */
> assert(binary);
>
> - dev_dbg(atomisp_dev, "ia_css_binary_find() enter: descr=%p, (mode=%d), binary=%p\n",
> - descr, descr->mode, binary);
> + dev_dbg(atomisp_dev, "%s() enter: descr=%p, (mode=%d), binary=%p\n",
> + __func__, descr, descr->mode, binary);
dev_dbg() already has __func__ in the output, why is it needed again?
thanks,
greg k-h
^ permalink raw reply
* Re: [PATCH v2] staging: sm750fb: fix CamelCase variables name in sm750
From: Greg KH @ 2026-05-26 16:20 UTC (permalink / raw)
To: Emmanuel Arias
Cc: sudipm.mukherjee, teddy.wang, linux-fbdev, linux-staging,
linux-kernel, kernel test robot
In-Reply-To: <20260526131631.1237672-1-eamanu@riseup.net>
On Tue, May 26, 2026 at 10:16:31AM -0300, Emmanuel Arias wrote:
> Replace CamelCase variable name with snake_case:
> - pvReg -> pv_reg
Why are you keeping the "pv_"? What does that mean?
> - setAllEngOff -> set_all_eng_off
>
> Reported-by: kernel test robot <lkp@intel.com>
The test robot told you to make this change?
> Closes: https://lore.kernel.org/oe-kbuild-all/202605171049.KbaBnrJV-lkp@intel.com/
> Signed-off-by: Emmanuel Arias <eamanu@riseup.net>
> ---
> drivers/staging/sm750fb/sm750.c | 6 +++---
> drivers/staging/sm750fb/sm750.h | 4 ++--
> drivers/staging/sm750fb/sm750_hw.c | 12 ++++++------
> 3 files changed, 11 insertions(+), 11 deletions(-)
What changed from v1?
thanks,
greg k-h
^ permalink raw reply
* [PATCH v2] staging: sm750fb: fix CamelCase variables name in sm750
From: Emmanuel Arias @ 2026-05-26 13:16 UTC (permalink / raw)
To: sudipm.mukherjee, teddy.wang, gregkh
Cc: linux-fbdev, linux-staging, linux-kernel, Emmanuel Arias,
kernel test robot
Replace CamelCase variable name with snake_case:
- pvReg -> pv_reg
- setAllEngOff -> set_all_eng_off
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202605171049.KbaBnrJV-lkp@intel.com/
Signed-off-by: Emmanuel Arias <eamanu@riseup.net>
---
drivers/staging/sm750fb/sm750.c | 6 +++---
drivers/staging/sm750fb/sm750.h | 4 ++--
drivers/staging/sm750fb/sm750_hw.c | 12 ++++++------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index 996a586a3727..9b30627a19d0 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -755,7 +755,7 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
* must be set after crtc member initialized
*/
crtc->cursor.offset = crtc->o_screen + crtc->vidmem_size - 1024;
- crtc->cursor.mmio = sm750_dev->pvReg +
+ crtc->cursor.mmio = sm750_dev->pv_reg +
0x800f0 + (int)crtc->channel * 0x140;
crtc->cursor.max_h = 64;
@@ -860,7 +860,7 @@ static void sm750fb_setup(struct sm750_dev *sm750_dev, char *src)
sm750_dev->init_parm.mem_clk = 0;
sm750_dev->init_parm.master_clk = 0;
sm750_dev->init_parm.power_mode = 0;
- sm750_dev->init_parm.setAllEngOff = 0;
+ sm750_dev->init_parm.set_all_eng_off = 0;
sm750_dev->init_parm.reset_memory = 1;
/* defaultly turn g_hwcursor on for both view */
@@ -1059,7 +1059,7 @@ static void lynxfb_pci_remove(struct pci_dev *pdev)
sm750fb_framebuffer_release(sm750_dev);
arch_phys_wc_del(sm750_dev->mtrr.vram);
- iounmap(sm750_dev->pvReg);
+ iounmap(sm750_dev->pv_reg);
iounmap(sm750_dev->vmem);
pci_release_region(pdev, 1);
kfree(g_settings);
diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h
index d2c522e67f26..e8885133da2e 100644
--- a/drivers/staging/sm750fb/sm750.h
+++ b/drivers/staging/sm750fb/sm750.h
@@ -44,7 +44,7 @@ struct init_status {
ushort chip_clk;
ushort mem_clk;
ushort master_clk;
- ushort setAllEngOff;
+ ushort set_all_eng_off;
ushort reset_memory;
};
@@ -97,7 +97,7 @@ struct sm750_dev {
unsigned long vidreg_start;
__u32 vidmem_size;
__u32 vidreg_size;
- void __iomem *pvReg;
+ void __iomem *pv_reg;
unsigned char __iomem *vmem;
/* locks*/
spinlock_t slock;
diff --git a/drivers/staging/sm750fb/sm750_hw.c b/drivers/staging/sm750fb/sm750_hw.c
index 6f7c354a34a1..2e2c7cffddab 100644
--- a/drivers/staging/sm750fb/sm750_hw.c
+++ b/drivers/staging/sm750fb/sm750_hw.c
@@ -40,18 +40,18 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev)
}
/* now map mmio and vidmem */
- sm750_dev->pvReg =
+ sm750_dev->pv_reg =
ioremap(sm750_dev->vidreg_start, sm750_dev->vidreg_size);
- if (!sm750_dev->pvReg) {
+ if (!sm750_dev->pv_reg) {
dev_err(&pdev->dev, "mmio failed\n");
ret = -EFAULT;
goto err_release_region;
}
- sm750_dev->accel.dpr_base = sm750_dev->pvReg + DE_BASE_ADDR_TYPE1;
- sm750_dev->accel.dp_port_base = sm750_dev->pvReg + DE_PORT_ADDR_TYPE1;
+ sm750_dev->accel.dpr_base = sm750_dev->pv_reg + DE_BASE_ADDR_TYPE1;
+ sm750_dev->accel.dp_port_base = sm750_dev->pv_reg + DE_PORT_ADDR_TYPE1;
- mmio750 = sm750_dev->pvReg;
+ mmio750 = sm750_dev->pv_reg;
sm750_set_chip_type(sm750_dev->devid, sm750_dev->revid);
sm750_dev->vidmem_start = pci_resource_start(pdev, 0);
@@ -75,7 +75,7 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev)
return 0;
err_unmap_reg:
- iounmap(sm750_dev->pvReg);
+ iounmap(sm750_dev->pv_reg);
err_release_region:
pci_release_region(pdev, 1);
return ret;
--
2.53.0
^ permalink raw reply related
* [PATCH v3] staging: media: Remove deprecated Atmel ISC drivers
From: Ashwin Gundarapu @ 2026-05-26 12:16 UTC (permalink / raw)
To: gregkh; +Cc: linux-kernel, linux-media, linux-staging
The Atmel ISC and XISC drivers were deprecated and scheduled
for removal by the beginning of 2026. The replacement drivers
(VIDEO_MICROCHIP_ISC and VIDEO_MICROCHIP_XISC) are available
in the main media subsystem.
Remove the Kconfig entries, Makefile rules, MAINTAINERS entries,
and the STAGING_MEDIA_DEPRECATED menuconfig since it is no longer
needed. The source files remain on disk but are no longer compiled
since the build infrastructure is removed.
Signed-off-by: Ashwin Gundarapu <linuxuser509@zohomail.in>
---
MAINTAINERS | 2 -
drivers/staging/media/Kconfig | 18 +------
drivers/staging/media/Makefile | 1 -
.../staging/media/deprecated/atmel/Kconfig | 47 -------------------
.../staging/media/deprecated/atmel/Makefile | 8 ----
5 files changed, 1 insertion(+), 75 deletions(-)
delete mode 100644 drivers/staging/media/deprecated/atmel/Kconfig
delete mode 100644 drivers/staging/media/deprecated/atmel/Makefile
diff --git a/MAINTAINERS b/MAINTAINERS
index 27a073f53cea..4290eae8838e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -17364,8 +17364,6 @@ F: Documentation/devicetree/bindings/media/atmel,isc.yaml
F: Documentation/devicetree/bindings/media/microchip,xisc.yaml
F: drivers/media/platform/microchip/microchip-isc*
F: drivers/media/platform/microchip/microchip-sama*-isc*
-F: drivers/staging/media/deprecated/atmel/atmel-isc*
-F: drivers/staging/media/deprecated/atmel/atmel-sama*-isc*
F: include/linux/atmel-isc-media.h
MICROCHIP ISI DRIVER
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 1aa31bddf970..52b4aab944f6 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -38,20 +38,4 @@ source "drivers/staging/media/sunxi/Kconfig"
source "drivers/staging/media/tegra-video/Kconfig"
-menuconfig STAGING_MEDIA_DEPRECATED
- bool "Media staging drivers (DEPRECATED)"
- default n
- help
- This option enables deprecated media drivers that are
- scheduled for future removal from the kernel.
-
- If you wish to work on these drivers to prevent their removal,
- then contact the linux-media@vger.kernel.org mailing list.
-
- If in doubt, say N here.
-
-if STAGING_MEDIA_DEPRECATED
-source "drivers/staging/media/deprecated/atmel/Kconfig"
-endif
-
-endif
+endif # STAGING_MEDIA
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 6f78b0edde1e..6fd7179733d8 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -1,5 +1,4 @@
# SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_VIDEO_ATMEL_ISC_BASE) += deprecated/atmel/
obj-$(CONFIG_INTEL_ATOMISP) += atomisp/
obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx/
obj-$(CONFIG_VIDEO_MAX96712) += max96712/
diff --git a/drivers/staging/media/deprecated/atmel/Kconfig b/drivers/staging/media/deprecated/atmel/Kconfig
deleted file mode 100644
index 418841ea5a0d..000000000000
--- a/drivers/staging/media/deprecated/atmel/Kconfig
+++ /dev/null
@@ -1,47 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-
-comment "Atmel media platform drivers"
-
-config VIDEO_ATMEL_ISC
- tristate "ATMEL Image Sensor Controller (ISC) support (DEPRECATED)"
- depends on V4L_PLATFORM_DRIVERS
- depends on VIDEO_DEV && COMMON_CLK
- depends on ARCH_AT91 || COMPILE_TEST
- depends on !VIDEO_MICROCHIP_ISC_BASE || COMPILE_TEST
- select MEDIA_CONTROLLER
- select VIDEO_V4L2_SUBDEV_API
- select VIDEOBUF2_DMA_CONTIG
- select REGMAP_MMIO
- select V4L2_FWNODE
- select VIDEO_ATMEL_ISC_BASE
- help
- This module makes the ATMEL Image Sensor Controller available
- as a v4l2 device.
-
- This driver is deprecated and is scheduled for removal by
- the beginning of 2026. See the TODO file for more information.
-
-config VIDEO_ATMEL_XISC
- tristate "ATMEL eXtended Image Sensor Controller (XISC) support (DEPRECATED)"
- depends on V4L_PLATFORM_DRIVERS
- depends on VIDEO_DEV && COMMON_CLK
- depends on ARCH_AT91 || COMPILE_TEST
- depends on !VIDEO_MICROCHIP_ISC_BASE || COMPILE_TEST
- select VIDEOBUF2_DMA_CONTIG
- select REGMAP_MMIO
- select V4L2_FWNODE
- select VIDEO_ATMEL_ISC_BASE
- select MEDIA_CONTROLLER
- select VIDEO_V4L2_SUBDEV_API
- help
- This module makes the ATMEL eXtended Image Sensor Controller
- available as a v4l2 device.
-
- This driver is deprecated and is scheduled for removal by
- the beginning of 2026. See the TODO file for more information.
-
-config VIDEO_ATMEL_ISC_BASE
- tristate
- default n
- help
- ATMEL ISC and XISC common code base.
diff --git a/drivers/staging/media/deprecated/atmel/Makefile b/drivers/staging/media/deprecated/atmel/Makefile
deleted file mode 100644
index 34eaeeac5bba..000000000000
--- a/drivers/staging/media/deprecated/atmel/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-atmel-isc-objs = atmel-sama5d2-isc.o
-atmel-xisc-objs = atmel-sama7g5-isc.o
-atmel-isc-common-objs = atmel-isc-base.o atmel-isc-clk.o
-
-obj-$(CONFIG_VIDEO_ATMEL_ISC_BASE) += atmel-isc-common.o
-obj-$(CONFIG_VIDEO_ATMEL_ISC) += atmel-isc.o
-obj-$(CONFIG_VIDEO_ATMEL_XISC) += atmel-xisc.o
--
2.43.0
^ permalink raw reply related
* [PATCH] media: atomisp: use __func__ in debug messages in binary.c
From: Jeongin Yeo @ 2026-05-26 10:47 UTC (permalink / raw)
To: hansg, mchehab
Cc: sakari.ailus, gregkh, andy, matt, linux-media, linux-staging,
linux-kernel, Jeongin Yeo
Replace hardcoded function name strings with __func__ macro in
dev_dbg() calls within ia_css_binary_find() as recommended by
kernel coding style.
No functional changes.
Signed-off-by: Jeongin Yeo <jeongin.yeo@luaberry.com>
---
.../atomisp/pci/runtime/binary/src/binary.c | 127 ++++++++++--------
1 file changed, 68 insertions(+), 59 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c b/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
index e9016d7775dc3..2355fdf357fcd 100644
--- a/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
+++ b/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
@@ -925,8 +925,8 @@ int ia_css_binary_find(struct ia_css_binary_descr *descr, struct ia_css_binary *
/* MW: used after an error check, may accept NULL, but doubtful */
assert(binary);
- dev_dbg(atomisp_dev, "ia_css_binary_find() enter: descr=%p, (mode=%d), binary=%p\n",
- descr, descr->mode, binary);
+ dev_dbg(atomisp_dev, "%s() enter: descr=%p, (mode=%d), binary=%p\n",
+ __func__, descr, descr->mode, binary);
mode = descr->mode;
online = descr->online;
@@ -992,8 +992,8 @@ int ia_css_binary_find(struct ia_css_binary_descr *descr, struct ia_css_binary *
/* printf("sh_css_binary_find: evaluating candidate:
* %d\n",candidate->id); */
dev_dbg(atomisp_dev,
- "ia_css_binary_find() candidate = %p, mode = %d ID = %d\n",
- candidate, candidate->pipeline.mode, candidate->id);
+ "%s() candidate = %p, mode = %d ID = %d\n",
+ __func__, candidate, candidate->pipeline.mode, candidate->id);
/*
* MW: Only a limited set of jointly configured binaries can
@@ -1003,15 +1003,15 @@ int ia_css_binary_find(struct ia_css_binary_descr *descr, struct ia_css_binary *
if (!candidate->enable.continuous &&
continuous && (mode != IA_CSS_BINARY_MODE_COPY)) {
dev_dbg(atomisp_dev,
- "ia_css_binary_find() [%d] continue: !%d && %d && (%d != %d)\n",
- __LINE__, candidate->enable.continuous,
+ "%s() [%d] continue: !%d && %d && (%d != %d)\n",
+ __func__, __LINE__, candidate->enable.continuous,
continuous, mode, IA_CSS_BINARY_MODE_COPY);
continue;
}
if (striped && candidate->iterator.num_stripes == 1) {
dev_dbg(atomisp_dev,
- "ia_css_binary_find() [%d] continue: binary is not striped\n",
- __LINE__);
+ "%s() [%d] continue: binary is not striped\n",
+ __func__, __LINE__);
continue;
}
@@ -1019,38 +1019,43 @@ int ia_css_binary_find(struct ia_css_binary_descr *descr, struct ia_css_binary *
(mode != IA_CSS_BINARY_MODE_COPY) &&
(mode != IA_CSS_BINARY_MODE_CAPTURE_PP) &&
(mode != IA_CSS_BINARY_MODE_VF_PP)) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: (%d != %d)\n",
- __LINE__, candidate->pipeline.isp_pipe_version, isp_pipe_version);
+ dev_dbg(atomisp_dev, "%s() [%d] continue: (%d != %d)\n",
+ __func__, __LINE__, candidate->pipeline.isp_pipe_version,
+ isp_pipe_version);
continue;
}
if (!candidate->enable.reduced_pipe && enable_reduced_pipe) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: !%d && %d\n",
- __LINE__, candidate->enable.reduced_pipe, enable_reduced_pipe);
+ dev_dbg(atomisp_dev, "%s() [%d] continue: !%d && %d\n",
+ __func__, __LINE__, candidate->enable.reduced_pipe,
+ enable_reduced_pipe);
continue;
}
if (!candidate->enable.dvs_6axis && enable_dvs_6axis) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: !%d && %d\n",
- __LINE__, candidate->enable.dvs_6axis, enable_dvs_6axis);
+ dev_dbg(atomisp_dev, "%s() [%d] continue: !%d && %d\n",
+ __func__, __LINE__, candidate->enable.dvs_6axis, enable_dvs_6axis);
continue;
}
if (candidate->enable.high_speed && !enable_high_speed) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: %d && !%d\n",
- __LINE__, candidate->enable.high_speed, enable_high_speed);
+ dev_dbg(atomisp_dev, "%s() [%d] continue: %d && !%d\n",
+ __func__, __LINE__, candidate->enable.high_speed,
+ enable_high_speed);
continue;
}
if (!candidate->enable.xnr && need_xnr) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: %d && !%d\n",
- __LINE__, candidate->enable.xnr, need_xnr);
+ dev_dbg(atomisp_dev, "%s() [%d] continue: %d && !%d\n",
+ __func__, __LINE__, candidate->enable.xnr, need_xnr);
continue;
}
if (!(candidate->enable.ds & 2) && enable_yuv_ds) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: !%d && %d\n",
- __LINE__, ((candidate->enable.ds & 2) != 0), enable_yuv_ds);
+ dev_dbg(atomisp_dev, "%s() [%d] continue: !%d && %d\n",
+ __func__, __LINE__, ((candidate->enable.ds & 2) != 0),
+ enable_yuv_ds);
continue;
}
if ((candidate->enable.ds & 2) && !enable_yuv_ds) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: %d && !%d\n",
- __LINE__, ((candidate->enable.ds & 2) != 0), enable_yuv_ds);
+ dev_dbg(atomisp_dev, "%s() [%d] continue: %d && !%d\n",
+ __func__, __LINE__, ((candidate->enable.ds & 2) != 0),
+ enable_yuv_ds);
continue;
}
@@ -1065,60 +1070,62 @@ int ia_css_binary_find(struct ia_css_binary_descr *descr, struct ia_css_binary *
/* or more than one output pin. */
xcandidate->num_output_pins > 1)) {
dev_dbg(atomisp_dev,
- "ia_css_binary_find() [%d] continue: (%p != NULL) && !(%d || %d || (%d >%d))\n",
- __LINE__, req_vf_info, candidate->enable.vf_veceven,
+ "%s() [%d] continue: (%p != NULL) && !(%d || %d || (%d >%d))\n",
+ __func__, __LINE__, req_vf_info, candidate->enable.vf_veceven,
candidate->vf_dec.is_variable, xcandidate->num_output_pins, 1);
continue;
}
if (!candidate->enable.dvs_envelope && need_dvs) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: !%d && %d\n",
- __LINE__, candidate->enable.dvs_envelope, (int)need_dvs);
+ dev_dbg(atomisp_dev, "%s() [%d] continue: !%d && %d\n",
+ __func__, __LINE__, candidate->enable.dvs_envelope, (int)need_dvs);
continue;
}
/* internal_res check considers input, output, and dvs envelope sizes */
ia_css_binary_internal_res(req_in_info, req_bds_out_info,
req_bin_out_info, &dvs_env, candidate, &internal_res);
if (internal_res.width > candidate->internal.max_width) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: (%d > %d)\n",
- __LINE__, internal_res.width, candidate->internal.max_width);
+ dev_dbg(atomisp_dev, "%s() [%d] continue: (%d > %d)\n",
+ __func__, __LINE__, internal_res.width,
+ candidate->internal.max_width);
continue;
}
if (internal_res.height > candidate->internal.max_height) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: (%d > %d)\n",
- __LINE__, internal_res.height, candidate->internal.max_height);
+ dev_dbg(atomisp_dev, "%s() [%d] continue: (%d > %d)\n",
+ __func__, __LINE__, internal_res.height,
+ candidate->internal.max_height);
continue;
}
if (!candidate->enable.ds && need_ds && !(xcandidate->num_output_pins > 1)) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: !%d && %d\n",
- __LINE__, candidate->enable.ds, (int)need_ds);
+ dev_dbg(atomisp_dev, "%s() [%d] continue: !%d && %d\n",
+ __func__, __LINE__, candidate->enable.ds, (int)need_ds);
continue;
}
if (!candidate->enable.uds && !candidate->enable.dvs_6axis && need_dz) {
dev_dbg(atomisp_dev,
- "ia_css_binary_find() [%d] continue: !%d && !%d && %d\n",
- __LINE__, candidate->enable.uds, candidate->enable.dvs_6axis,
- (int)need_dz);
+ "%s() [%d] continue: !%d && !%d && %d\n",
+ __func__, __LINE__, candidate->enable.uds,
+ candidate->enable.dvs_6axis, (int)need_dz);
continue;
}
if (online && candidate->input.source == IA_CSS_BINARY_INPUT_MEMORY) {
dev_dbg(atomisp_dev,
- "ia_css_binary_find() [%d] continue: %d && (%d == %d)\n",
- __LINE__, online, candidate->input.source,
+ "%s() [%d] continue: %d && (%d == %d)\n",
+ __func__, __LINE__, online, candidate->input.source,
IA_CSS_BINARY_INPUT_MEMORY);
continue;
}
if (!online && candidate->input.source == IA_CSS_BINARY_INPUT_SENSOR) {
dev_dbg(atomisp_dev,
- "ia_css_binary_find() [%d] continue: !%d && (%d == %d)\n",
- __LINE__, online, candidate->input.source,
+ "%s() [%d] continue: !%d && (%d == %d)\n",
+ __func__, __LINE__, online, candidate->input.source,
IA_CSS_BINARY_INPUT_SENSOR);
continue;
}
if (req_bin_out_info->res.width < candidate->output.min_width ||
req_bin_out_info->res.width > candidate->output.max_width) {
dev_dbg(atomisp_dev,
- "ia_css_binary_find() [%d] continue: (%d > %d) || (%d < %d)\n",
- __LINE__, req_bin_out_info->padded_width,
+ "%s() [%d] continue: (%d > %d) || (%d < %d)\n",
+ __func__, __LINE__, req_bin_out_info->padded_width,
candidate->output.min_width, req_bin_out_info->padded_width,
candidate->output.max_width);
continue;
@@ -1128,20 +1135,21 @@ int ia_css_binary_find(struct ia_css_binary_descr *descr, struct ia_css_binary *
req_vf_info) { /* and we need vf output. */
if (req_vf_info->res.width > candidate->output.max_width) {
dev_dbg(atomisp_dev,
- "ia_css_binary_find() [%d] continue: (%d < %d)\n",
- __LINE__, req_vf_info->res.width,
+ "%s() [%d] continue: (%d < %d)\n",
+ __func__, __LINE__, req_vf_info->res.width,
candidate->output.max_width);
continue;
}
}
if (req_in_info->padded_width > candidate->input.max_width) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: (%d > %d)\n",
- __LINE__, req_in_info->padded_width, candidate->input.max_width);
+ dev_dbg(atomisp_dev, "%s() [%d] continue: (%d > %d)\n",
+ __func__, __LINE__, req_in_info->padded_width,
+ candidate->input.max_width);
continue;
}
if (!binary_supports_output_format(xcandidate, req_bin_out_info->format)) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: !%d\n",
- __LINE__, binary_supports_output_format(xcandidate,
+ dev_dbg(atomisp_dev, "%s() [%d] continue: !%d\n",
+ __func__, __LINE__, binary_supports_output_format(xcandidate,
req_bin_out_info->format));
continue;
}
@@ -1152,8 +1160,8 @@ int ia_css_binary_find(struct ia_css_binary_descr *descr, struct ia_css_binary *
is supported. */
!binary_supports_output_format(xcandidate, req_vf_info->format)) {
dev_dbg(atomisp_dev,
- "ia_css_binary_find() [%d] continue: (%d > %d) && (%p != NULL) && !%d\n",
- __LINE__, xcandidate->num_output_pins, 1, req_vf_info,
+ "%s() [%d] continue: (%d > %d) && (%p != NULL) && !%d\n",
+ __func__, __LINE__, xcandidate->num_output_pins, 1, req_vf_info,
binary_supports_output_format(xcandidate, req_vf_info->format));
continue;
}
@@ -1163,8 +1171,8 @@ int ia_css_binary_find(struct ia_css_binary_descr *descr, struct ia_css_binary *
req_vf_info && candidate->enable.vf_veceven &&
!binary_supports_vf_format(xcandidate, req_vf_info->format)) {
dev_dbg(atomisp_dev,
- "ia_css_binary_find() [%d] continue: (%d == %d) && (%p != NULL) && %d && !%d\n",
- __LINE__, xcandidate->num_output_pins, 1,
+ "%s() [%d] continue: (%d == %d) && (%p != NULL) && %d && !%d\n",
+ __func__, __LINE__, xcandidate->num_output_pins, 1,
req_vf_info, candidate->enable.vf_veceven,
binary_supports_vf_format(xcandidate, req_vf_info->format));
continue;
@@ -1175,8 +1183,8 @@ int ia_css_binary_find(struct ia_css_binary_descr *descr, struct ia_css_binary *
req_vf_info && candidate->enable.vf_veceven) { /* and we need vf output. */
if (req_vf_info->res.width > candidate->output.max_width) {
dev_dbg(atomisp_dev,
- "ia_css_binary_find() [%d] continue: (%d < %d)\n",
- __LINE__, req_vf_info->res.width,
+ "%s() [%d] continue: (%d < %d)\n",
+ __func__, __LINE__, req_vf_info->res.width,
candidate->output.max_width);
continue;
}
@@ -1184,21 +1192,22 @@ int ia_css_binary_find(struct ia_css_binary_descr *descr, struct ia_css_binary *
if (!supports_bds_factor(candidate->bds.supported_bds_factors,
descr->required_bds_factor)) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: 0x%x & 0x%x)\n",
- __LINE__, candidate->bds.supported_bds_factors,
+ dev_dbg(atomisp_dev, "%s() [%d] continue: 0x%x & 0x%x)\n",
+ __func__, __LINE__, candidate->bds.supported_bds_factors,
descr->required_bds_factor);
continue;
}
if (!candidate->enable.dpc && need_dpc) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: 0x%x & 0x%x)\n",
- __LINE__, candidate->enable.dpc, descr->enable_dpc);
+ dev_dbg(atomisp_dev, "%s() [%d] continue: 0x%x & 0x%x)\n",
+ __func__, __LINE__, candidate->enable.dpc, descr->enable_dpc);
continue;
}
if (candidate->uds.use_bci && enable_capture_pp_bli) {
- dev_dbg(atomisp_dev, "ia_css_binary_find() [%d] continue: 0x%x & 0x%x)\n",
- __LINE__, candidate->uds.use_bci, descr->enable_capture_pp_bli);
+ dev_dbg(atomisp_dev, "%s() [%d] continue: 0x%x & 0x%x)\n",
+ __func__, __LINE__, candidate->uds.use_bci,
+ descr->enable_capture_pp_bli);
continue;
}
--
2.43.0
^ permalink raw reply related
* [PATCH] staging: rtl8723bs: fix spelling mistake found by codespell
From: Tomasz Unger @ 2026-05-26 10:04 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-staging, linux-kernel, Tomasz Unger
In-Reply-To: <20260526-fix-typo-odm-dig-v1-1-4392b0c03e13.ref@yahoo.pl>
Corrected typo: FASLE -> FALSE in comment
Signed-off-by: Tomasz Unger <tomasz.unger@yahoo.pl>
---
drivers/staging/rtl8723bs/hal/odm_DIG.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/rtl8723bs/hal/odm_DIG.c b/drivers/staging/rtl8723bs/hal/odm_DIG.c
index 4e28b7742bfe..c862c86b7695 100644
--- a/drivers/staging/rtl8723bs/hal/odm_DIG.c
+++ b/drivers/staging/rtl8723bs/hal/odm_DIG.c
@@ -590,7 +590,7 @@ void odm_DIGbyRSSI_LPS(void *pDM_VOID)
}
/* 3 ============================================================ */
-/* 3 FASLE ALARM CHECK */
+/* 3 FALSE ALARM CHECK */
/* 3 ============================================================ */
void odm_FalseAlarmCounterStatistics(void *pDM_VOID)
---
base-commit: 7cb1c5b32a2bfde961fff8d5204526b609bcb30a
change-id: 20260526-fix-typo-odm-dig-e8a4268e9408
Best regards,
--
Tomasz Unger <tomasz.unger@yahoo.pl>
^ permalink raw reply related
* [PATCH v2] staging: media: Remove deprecated Atmel ISC drivers
From: Ashwin Gundarapu @ 2026-05-26 4:44 UTC (permalink / raw)
To: gregkh; +Cc: linux-kernel, linux-staging, linux-media
The Atmel ISC and XISC drivers were deprecated and scheduled
for removal by the beginning of 2026. The replacement drivers
(VIDEO_MICROCHIP_ISC and VIDEO_MICROCHIP_XISC) are available
in the main media subsystem.
Remove the Kconfig entries, Makefile rules, and the
STAGING_MEDIA_DEPRECATED menuconfig since it is no longer
needed. The source files remain on disk but are no longer
compiled since the build infrastructure is removed.
Signed-off-by: Ashwin Gundarapu <linuxuser509@zohomail.in>
---
drivers/staging/media/Kconfig | 18 +------
drivers/staging/media/Makefile | 1 -
.../staging/media/deprecated/atmel/Kconfig | 47 -------------------
.../staging/media/deprecated/atmel/Makefile | 8 ----
4 files changed, 1 insertion(+), 73 deletions(-)
delete mode 100644 drivers/staging/media/deprecated/atmel/Kconfig
delete mode 100644 drivers/staging/media/deprecated/atmel/Makefile
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 1aa31bddf970..52b4aab944f6 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -38,20 +38,4 @@ source "drivers/staging/media/sunxi/Kconfig"
source "drivers/staging/media/tegra-video/Kconfig"
-menuconfig STAGING_MEDIA_DEPRECATED
- bool "Media staging drivers (DEPRECATED)"
- default n
- help
- This option enables deprecated media drivers that are
- scheduled for future removal from the kernel.
-
- If you wish to work on these drivers to prevent their removal,
- then contact the linux-media@vger.kernel.org mailing list.
-
- If in doubt, say N here.
-
-if STAGING_MEDIA_DEPRECATED
-source "drivers/staging/media/deprecated/atmel/Kconfig"
-endif
-
-endif
+endif # STAGING_MEDIA
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 6f78b0edde1e..6fd7179733d8 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -1,5 +1,4 @@
# SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_VIDEO_ATMEL_ISC_BASE) += deprecated/atmel/
obj-$(CONFIG_INTEL_ATOMISP) += atomisp/
obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx/
obj-$(CONFIG_VIDEO_MAX96712) += max96712/
diff --git a/drivers/staging/media/deprecated/atmel/Kconfig b/drivers/staging/media/deprecated/atmel/Kconfig
deleted file mode 100644
index 418841ea5a0d..000000000000
--- a/drivers/staging/media/deprecated/atmel/Kconfig
+++ /dev/null
@@ -1,47 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-
-comment "Atmel media platform drivers"
-
-config VIDEO_ATMEL_ISC
- tristate "ATMEL Image Sensor Controller (ISC) support (DEPRECATED)"
- depends on V4L_PLATFORM_DRIVERS
- depends on VIDEO_DEV && COMMON_CLK
- depends on ARCH_AT91 || COMPILE_TEST
- depends on !VIDEO_MICROCHIP_ISC_BASE || COMPILE_TEST
- select MEDIA_CONTROLLER
- select VIDEO_V4L2_SUBDEV_API
- select VIDEOBUF2_DMA_CONTIG
- select REGMAP_MMIO
- select V4L2_FWNODE
- select VIDEO_ATMEL_ISC_BASE
- help
- This module makes the ATMEL Image Sensor Controller available
- as a v4l2 device.
-
- This driver is deprecated and is scheduled for removal by
- the beginning of 2026. See the TODO file for more information.
-
-config VIDEO_ATMEL_XISC
- tristate "ATMEL eXtended Image Sensor Controller (XISC) support (DEPRECATED)"
- depends on V4L_PLATFORM_DRIVERS
- depends on VIDEO_DEV && COMMON_CLK
- depends on ARCH_AT91 || COMPILE_TEST
- depends on !VIDEO_MICROCHIP_ISC_BASE || COMPILE_TEST
- select VIDEOBUF2_DMA_CONTIG
- select REGMAP_MMIO
- select V4L2_FWNODE
- select VIDEO_ATMEL_ISC_BASE
- select MEDIA_CONTROLLER
- select VIDEO_V4L2_SUBDEV_API
- help
- This module makes the ATMEL eXtended Image Sensor Controller
- available as a v4l2 device.
-
- This driver is deprecated and is scheduled for removal by
- the beginning of 2026. See the TODO file for more information.
-
-config VIDEO_ATMEL_ISC_BASE
- tristate
- default n
- help
- ATMEL ISC and XISC common code base.
diff --git a/drivers/staging/media/deprecated/atmel/Makefile b/drivers/staging/media/deprecated/atmel/Makefile
deleted file mode 100644
index 34eaeeac5bba..000000000000
--- a/drivers/staging/media/deprecated/atmel/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-atmel-isc-objs = atmel-sama5d2-isc.o
-atmel-xisc-objs = atmel-sama7g5-isc.o
-atmel-isc-common-objs = atmel-isc-base.o atmel-isc-clk.o
-
-obj-$(CONFIG_VIDEO_ATMEL_ISC_BASE) += atmel-isc-common.o
-obj-$(CONFIG_VIDEO_ATMEL_ISC) += atmel-isc.o
-obj-$(CONFIG_VIDEO_ATMEL_XISC) += atmel-xisc.o
--
2.43.0
^ permalink raw reply related
* Re: [PATCH] staging: rtl8723bs: fix coding style in rtw_cmd.c
From: Ahmet Sezgin Duran @ 2026-05-25 20:23 UTC (permalink / raw)
To: Krzysztof Woś, Greg Kroah-Hartman, linux-staging
Cc: linux-kernel, khushalchitturi, architanant5, s9430939,
andriy.shevchenko, kees
In-Reply-To: <20260525201001.14852-1-krzysztofina2022@gmail.com>
On 5/25/26 11:10 PM, Krzysztof Woś wrote:
> Fix spdx comment style and indentation in rtw_cmd.c to resolve
> errors and warnings reported by checkpatch.pl.
>
> Signed-off-by: Krzysztof Woś <krzysztofina2022@gmail.com>
> ---
> drivers/staging/rtl8723bs/core/rtw_cmd.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
> index c1185c25ed36..dac7a615d158 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
> @@ -184,7 +184,8 @@ int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv)
> return -ENOMEM;
> }
>
> - pcmdpriv->rsp_buf = pcmdpriv->rsp_allocated_buf + 4 - ((SIZE_PTR)(pcmdpriv->rsp_allocated_buf) & 3);
> + pcmdpriv->rsp_buf = pcmdpriv->rsp_allocated_buf + 4 -
> + ((SIZE_PTR)(pcmdpriv->rsp_allocated_buf) & 3);
>
> pcmdpriv->cmd_issued_cnt = 0;
> pcmdpriv->cmd_done_cnt = 0;
Does not apply to staging-testing branch.
Regards,
Ahmet Sezgin Duran
^ permalink raw reply
* [PATCH] staging: rtl8723bs: fix coding style in rtw_cmd.c
From: Krzysztof Woś @ 2026-05-25 20:10 UTC (permalink / raw)
To: Greg Kroah-Hartman, linux-staging
Cc: linux-kernel, khushalchitturi, architanant5, s9430939,
andriy.shevchenko, kees, Krzysztof Woś
Fix spdx comment style and indentation in rtw_cmd.c to resolve
errors and warnings reported by checkpatch.pl.
Signed-off-by: Krzysztof Woś <krzysztofina2022@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_cmd.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index c1185c25ed36..dac7a615d158 100644
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -184,7 +184,8 @@ int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv)
return -ENOMEM;
}
- pcmdpriv->rsp_buf = pcmdpriv->rsp_allocated_buf + 4 - ((SIZE_PTR)(pcmdpriv->rsp_allocated_buf) & 3);
+ pcmdpriv->rsp_buf = pcmdpriv->rsp_allocated_buf + 4 -
+ ((SIZE_PTR)(pcmdpriv->rsp_allocated_buf) & 3);
pcmdpriv->cmd_issued_cnt = 0;
pcmdpriv->cmd_done_cnt = 0;
--
2.47.3
^ permalink raw reply related
* Re: 答复: [PATCH 2/2] staging: i3c: add Realtek RTS490x I3C HUB driver
From: Greg KH @ 2026-05-25 19:12 UTC (permalink / raw)
To: 周寅
Cc: linux-staging@lists.linux.dev, linux-i3c@lists.infradead.org,
devicetree@vger.kernel.org, alexandre.belloni@bootlin.com,
Frank.Li@nxp.com, robh@kernel.org, krzk+dt@kernel.org,
conor+dt@kernel.org, linusw@kernel.org, brgl@kernel.org,
linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
王炜
In-Reply-To: <1a79b9c3c6c64e5ba65292efa2f0472f@realsil.com.cn>
On Mon, May 25, 2026 at 12:58:33PM +0000, 周寅 wrote:
> Thank you for the review.
>
> We noticed that the NXP P3H2x4x series (v10) introduces a generic
> I3C hub framework. Would you recommend waiting for that to land
> before resubmitting to the proper location?
I have no context, and do not know, why not ask the i3c maintainer?
greg k-h
^ permalink raw reply
* Re: [PATCH v2 2/2] staging: i3c: add Realtek RTS490x I3C HUB driver
From: Greg KH @ 2026-05-25 19:11 UTC (permalink / raw)
To: zain_zhou
Cc: linux-staging, linux-i3c, devicetree, alexandre.belloni, Frank.Li,
robh, krzk+dt, conor+dt, linusw, brgl, linux-gpio, linux-kernel,
wei_wang
In-Reply-To: <20260525125128.297-2-zain_zhou@realsil.com.cn>
On Mon, May 25, 2026 at 08:51:28PM +0800, zain_zhou@realsil.com.cn wrote:
> From: Yin Zhou <zain_zhou@realsil.com.cn>
>
> Add driver for Realtek RTS490x series I3C HUB devices.
>
> The driver supports:
> - Device Tree based configuration of LDO, pull-up, IO strength
> and per-port mode (I3C/SMBus/GPIO/disabled)
> - Logical I3C bus registration per target port
> - SMBus agent functionality with IBI and polling modes
> - GPIO chip with IRQ support
> - DebugFS interface for register access and DT config inspection
> - IBI (In-Band Interrupt) handling
>
> The driver is placed in staging as it has known issues to be resolved
> before mainlining; see drivers/staging/rts490x/TODO for details.
No, again, please do this correctly and fix up everything and put it in
the real part of the kernel. It will only take you more work if it were
to be in staging.
thanks,
greg k-h
^ permalink raw reply
* Re: [PATCH v2 1/2] dt-bindings: i3c: add Realtek RTS490x I3C HUB
From: Rob Herring (Arm) @ 2026-05-25 18:45 UTC (permalink / raw)
To: zain_zhou
Cc: krzk+dt, linux-staging, gregkh, devicetree, alexandre.belloni,
Frank.Li, conor+dt, linux-i3c, linux-kernel, brgl, linux-gpio,
linusw, wei_wang
In-Reply-To: <20260525125128.297-1-zain_zhou@realsil.com.cn>
On Mon, 25 May 2026 20:51:27 +0800, zain_zhou@realsil.com.cn wrote:
> From: Yin Zhou <zain_zhou@realsil.com.cn>
>
> Add DT binding schema for Realtek RTS490x series I3C HUB devices.
>
> The binding describes configuration properties for:
> - LDO enable/disable and voltage level per port group
> - Pull-up resistance per port group
> - IO driver strength per port
> - Per target-port mode (I3C/SMBus/GPIO/disabled), pull-up,
> IO mode, SMBus clock frequency and polling interval
> - Hub network always-I3C mode
> - Hardware identification via CSEL pin (id) and CP1 pins (id-cp1)
>
> Signed-off-by: Yin Zhou <zain_zhou@realsil.com.cn>
>
> Changes in v2:
> - Rework binding per Krzysztof Kozlowski's review:
> add realtek, vendor prefix to all custom properties; use boolean
> for enable flags; use u32 with unit suffixes (-microvolt, -ohms)
> for voltage/resistance; change to unevaluatedProperties: false;
> fix title, maintainer name, description, $nodename pattern
> - Consolidate examples; add dt-bindings/i2c/i2c.h include
> ---
> .../bindings/i3c/realtek,rts490x-i3c-hub.yaml | 263 ++++++++++++++++++
> 1 file changed, 263 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/i3c/realtek,rts490x-i3c-hub.yaml
>
My bot found errors running 'make dt_binding_check' on your patch:
yamllint warnings/errors:
dtschema/dtc warnings/errors:
Documentation/devicetree/bindings/i3c/realtek,rts490x-i3c-hub.example.dtb: /example-0/i3c-master@d040000/hub@70,4ba00000000/target-port@1/i2c@10: failed to match any schema with compatible: ['i2c-slave-mqueue']
doc reference errors (make refcheckdocs):
See https://patchwork.kernel.org/project/devicetree/patch/20260525125128.297-1-zain_zhou@realsil.com.cn
The base for the series is generally the latest rc1. A different dependency
should be noted in *this* patch.
If you already ran 'make dt_binding_check' and didn't see the above
error(s), then make sure 'yamllint' is installed and dt-schema is up to
date:
pip3 install dtschema --upgrade
Please check and re-submit after running the above command yourself. Note
that DT_SCHEMA_FILES can be set to your schema file to speed up checking
your schema. However, it must be unset to test all examples with your schema.
^ permalink raw reply
* Re: [PATCH 5/5] staging: sm750fb: deduplicate fbinfo loop in suspend/resume
From: Dan Carpenter @ 2026-05-25 17:59 UTC (permalink / raw)
To: Ahmet Sezgin Duran; +Cc: gregkh, linux-fbdev, linux-staging, linux-kernel
In-Reply-To: <6a5de920-b246-4568-8c32-626a696c670a@sezginduran.net>
On Mon, May 25, 2026 at 07:31:33PM +0300, Ahmet Sezgin Duran wrote:
> On 5/25/26 7:13 PM, Dan Carpenter wrote:
>
> >
> > I thought you were going to to abandon the ARRAY_SIZE(cdb) in v2.
> >
> > regards,
> > dan carpenter
> >
>
> Which, I did:
>
> (v2 link): https://lore.kernel.org/linux-staging/20260523153459.177488-1-ahmet@sezginduran.net/
>
Ah, right. Fair enough.
regards,
dan carpenter
^ permalink raw reply
* [PATCH v8 3/3] staging: rtl8723bs: refactor queue priority initialization
From: artur.ugnivenko @ 2026-05-25 17:36 UTC (permalink / raw)
To: gregkh; +Cc: linux-kernel, linux-staging, ahmet, error27, Artur Ugnivenko
In-Reply-To: <20260525163532.20317-3-artur.ugnivenko@gmx.de>
From: Artur Ugnivenko <artur.ugnivenko@gmx.de>
Pack individual priority values into an enum-indexed array
to simplify the initialization code and prevent passing around
six loose values as function parameters.
Signed-off-by: Artur Ugnivenko <artur.ugnivenko@gmx.de>
---
Changes in v8:
- Remove the struct from v7, use an enum-indexed array instead
- Remove other lines ending in parentheses fixes to keep the
commit small
Changes in v7:
- Add changelog.
- Add transmit_queues struct in include/drv_types.h to improve
style of _InitNormalChipRegPriority
Changes in v6: Make the patch apply to gregkh/staging-testing.
Changes in v5: No changes in this patch.
Changes in v4: No changes in this patch.
Changes in v3: Split the patch into multiple patches.
Changes in v2: Make patch apply to gregkh/staging-testing.
drivers/staging/rtl8723bs/hal/sdio_halinit.c | 108 +++++++++---------
drivers/staging/rtl8723bs/include/drv_types.h | 10 ++
2 files changed, 65 insertions(+), 53 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index 6f2aea984b30..01911188fd44 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -188,25 +188,18 @@ static void _InitTxBufferBoundary(struct adapter *padapter)
rtw_write8(padapter, REG_TDECTRL + 1, txpktbuf_bndy);
}
-static void _InitNormalChipRegPriority(
- struct adapter *Adapter,
- u16 beQ,
- u16 bkQ,
- u16 viQ,
- u16 voQ,
- u16 mgtQ,
- u16 hiQ
-)
+static void _InitNormalChipRegPriority(struct adapter *Adapter,
+ u16 queues[TX_Q_MAX])
{
u16 value16 = (rtw_read16(Adapter, REG_TRXDMA_CTRL) & 0x7);
value16 |=
- _TXDMA_BEQ_MAP(beQ) |
- _TXDMA_BKQ_MAP(bkQ) |
- _TXDMA_VIQ_MAP(viQ) |
- _TXDMA_VOQ_MAP(voQ) |
- _TXDMA_MGQ_MAP(mgtQ) |
- _TXDMA_HIQ_MAP(hiQ);
+ _TXDMA_BEQ_MAP(queues[TX_Q_BE]) |
+ _TXDMA_BKQ_MAP(queues[TX_Q_BK]) |
+ _TXDMA_VIQ_MAP(queues[TX_Q_VI]) |
+ _TXDMA_VOQ_MAP(queues[TX_Q_VO]) |
+ _TXDMA_MGQ_MAP(queues[TX_Q_MGT]) |
+ _TXDMA_HIQ_MAP(queues[TX_Q_HI]);
rtw_write16(Adapter, REG_TRXDMA_CTRL, value16);
}
@@ -231,17 +224,18 @@ static void _InitNormalChipOneOutEpPriority(struct adapter *Adapter)
break;
}
- _InitNormalChipRegPriority(
- Adapter, value, value, value, value, value, value
- );
+ u16 queues[TX_Q_MAX];
+
+ for (int i = 0; i < TX_Q_MAX; i++)
+ queues[i] = value;
+ _InitNormalChipRegPriority(Adapter, queues);
}
static void _InitNormalChipTwoOutEpPriority(struct adapter *Adapter)
{
struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);
struct registry_priv *pregistrypriv = &Adapter->registrypriv;
- u16 beQ, bkQ, viQ, voQ, mgtQ, hiQ;
u16 valueHi = 0;
u16 valueLow = 0;
@@ -263,50 +257,58 @@ static void _InitNormalChipTwoOutEpPriority(struct adapter *Adapter)
break;
}
+ u16 typical_queues[TX_Q_MAX] = {
+ [TX_Q_BE] = valueLow,
+ [TX_Q_BK] = valueLow,
+ [TX_Q_VI] = valueHi,
+ [TX_Q_VO] = valueHi,
+ [TX_Q_MGT] = valueHi,
+ [TX_Q_HI] = valueHi,
+ };
+
+ u16 wmm_queues[TX_Q_MAX] = {
+ [TX_Q_BE] = valueLow,
+ [TX_Q_BK] = valueHi,
+ [TX_Q_VI] = valueHi,
+ [TX_Q_VO] = valueLow,
+ [TX_Q_MGT] = valueHi,
+ [TX_Q_HI] = valueHi,
+ };
+
if (!pregistrypriv->wifi_spec) {
- beQ = valueLow;
- bkQ = valueLow;
- viQ = valueHi;
- voQ = valueHi;
- mgtQ = valueHi;
- hiQ = valueHi;
+ _InitNormalChipRegPriority(Adapter, typical_queues);
} else {
/* for WMM , CONFIG_OUT_EP_WIFI_MODE */
- beQ = valueLow;
- bkQ = valueHi;
- viQ = valueHi;
- voQ = valueLow;
- mgtQ = valueHi;
- hiQ = valueHi;
+ _InitNormalChipRegPriority(Adapter, wmm_queues);
}
-
- _InitNormalChipRegPriority(Adapter, beQ, bkQ, viQ, voQ, mgtQ, hiQ);
-
}
static void _InitNormalChipThreeOutEpPriority(struct adapter *padapter)
{
struct registry_priv *pregistrypriv = &padapter->registrypriv;
- u16 beQ, bkQ, viQ, voQ, mgtQ, hiQ;
- if (!pregistrypriv->wifi_spec) {
- /* typical setting */
- beQ = QUEUE_LOW;
- bkQ = QUEUE_LOW;
- viQ = QUEUE_NORMAL;
- voQ = QUEUE_HIGH;
- mgtQ = QUEUE_HIGH;
- hiQ = QUEUE_HIGH;
- } else {
- /* for WMM */
- beQ = QUEUE_LOW;
- bkQ = QUEUE_NORMAL;
- viQ = QUEUE_NORMAL;
- voQ = QUEUE_HIGH;
- mgtQ = QUEUE_HIGH;
- hiQ = QUEUE_HIGH;
- }
- _InitNormalChipRegPriority(padapter, beQ, bkQ, viQ, voQ, mgtQ, hiQ);
+ u16 typical_queues[TX_Q_MAX] = {
+ [TX_Q_BE] = QUEUE_LOW,
+ [TX_Q_BK] = QUEUE_LOW,
+ [TX_Q_VI] = QUEUE_NORMAL,
+ [TX_Q_VO] = QUEUE_HIGH,
+ [TX_Q_MGT] = QUEUE_HIGH,
+ [TX_Q_HI] = QUEUE_HIGH,
+ };
+
+ u16 wmm_queues[TX_Q_MAX] = {
+ [TX_Q_BE] = QUEUE_LOW,
+ [TX_Q_BK] = QUEUE_NORMAL,
+ [TX_Q_VI] = QUEUE_NORMAL,
+ [TX_Q_VO] = QUEUE_HIGH,
+ [TX_Q_MGT] = QUEUE_HIGH,
+ [TX_Q_HI] = QUEUE_HIGH,
+ };
+
+ if (!pregistrypriv->wifi_spec)
+ _InitNormalChipRegPriority(padapter, typical_queues);
+ else
+ _InitNormalChipRegPriority(padapter, wmm_queues);
}
static void _InitQueuePriority(struct adapter *Adapter)
diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/staging/rtl8723bs/include/drv_types.h
index 552d0c5fa47f..b2c43f53571a 100644
--- a/drivers/staging/rtl8723bs/include/drv_types.h
+++ b/drivers/staging/rtl8723bs/include/drv_types.h
@@ -373,6 +373,16 @@ struct adapter {
unsigned char in_cta_test;
};
+enum transmit_queues {
+ TX_Q_BE = 0,
+ TX_Q_BK,
+ TX_Q_VI,
+ TX_Q_VO,
+ TX_Q_MGT,
+ TX_Q_HI,
+ TX_Q_MAX,
+};
+
#define adapter_to_dvobj(adapter) (adapter->dvobj)
#define adapter_to_pwrctl(adapter) (dvobj_to_pwrctl(adapter->dvobj))
#define adapter_wdev_data(adapter) (&((adapter)->wdev_data))
--
2.54.0
^ permalink raw reply related
* [PATCH v8 2/3] staging: rtl8723bs: fix inconsistent braces in hal/sdio_halinit.c
From: artur.ugnivenko @ 2026-05-25 16:35 UTC (permalink / raw)
To: gregkh; +Cc: linux-kernel, linux-staging, ahmet, error27, Artur Ugnivenko
In-Reply-To: <20260525163532.20317-1-artur.ugnivenko@gmx.de>
From: Artur Ugnivenko <artur.ugnivenko@gmx.de>
Fix checkpatch warnings on inconsistent braces around if/else statements
in hal/sdio_halinit.c
Signed-off-by: Artur Ugnivenko <artur.ugnivenko@gmx.de>
---
Changes in v8: No changes in this patch.
Changes in v7: Add changelog.
Changes in v6: Make the patch apply to gregkh/staging-testing.
Changes in v5: No changes in this patch.
Changes in v4: Fix long line checkpatch warning.
Changes in v3: Split the patch into multiple patches.
Changes in v2: Make patch apply to gregkh/staging-testing.
drivers/staging/rtl8723bs/hal/sdio_halinit.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index 43f9c45967f4..6f2aea984b30 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -36,8 +36,9 @@ static u8 CardEnable(struct adapter *padapter)
bMacPwrCtrlOn = true;
rtw_hal_set_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn);
}
- } else
+ } else {
ret = _SUCCESS;
+ }
return ret;
}
@@ -1011,8 +1012,9 @@ static void Hal_EfuseParseBoardType_8723BS(
pHalData->BoardType = (hwinfo[EEPROM_RF_BOARD_OPTION_8723B] & 0xE0) >> 5;
if (pHalData->BoardType == 0xFF)
pHalData->BoardType = (EEPROM_DEFAULT_BOARD_OPTION & 0xE0) >> 5;
- } else
+ } else {
pHalData->BoardType = 0;
+ }
}
static void _ReadEfuseInfo8723BS(struct adapter *padapter)
--
2.54.0
^ permalink raw reply related
* [PATCH v8 1/3] staging: rtl8723bs: shorten long lines in hal/sdio_halinit.c
From: artur.ugnivenko @ 2026-05-25 16:35 UTC (permalink / raw)
To: gregkh; +Cc: linux-kernel, linux-staging, ahmet, error27, Artur Ugnivenko
In-Reply-To: <20260525163532.20317-1-artur.ugnivenko@gmx.de>
From: Artur Ugnivenko <artur.ugnivenko@gmx.de>
Fix checkpatch warnings on lines above 100 chars in length by splitting
long function calls and long comments into multiple lines.
Signed-off-by: Artur Ugnivenko <artur.ugnivenko@gmx.de>
---
Changes in v8: No changes in this patch.
Changes in v7: Add changelog.
Changes in v6: Make the patch apply to gregkh/staging-testing.
Changes in v5: No changes in this patch.
Changes in v4: No changes in this patch.
Changes in v3: Split the patch into multiple patches.
Changes in v2: Make the patch apply to gregkh/staging-testing.
drivers/staging/rtl8723bs/hal/sdio_halinit.c | 52 ++++++++++++++++----
1 file changed, 42 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index ed9b8fb07fec..43f9c45967f4 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -27,7 +27,11 @@ static u8 CardEnable(struct adapter *padapter)
/* unlock ISO/CLK/Power control register */
rtw_write8(padapter, REG_RSV_CTRL, 0x0);
- ret = HalPwrSeqCmdParsing(padapter, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK, rtl8723B_card_enable_flow);
+ ret = HalPwrSeqCmdParsing(padapter,
+ PWR_CUT_ALL_MSK,
+ PWR_FAB_ALL_MSK,
+ PWR_INTF_SDIO_MSK,
+ rtl8723B_card_enable_flow);
if (ret == _SUCCESS) {
bMacPwrCtrlOn = true;
rtw_hal_set_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn);
@@ -104,7 +108,11 @@ u8 _InitPowerOn_8723BS(struct adapter *padapter)
}
/* Tx Page FIFO threshold */
-static void _init_available_page_threshold(struct adapter *padapter, u8 numHQ, u8 numNQ, u8 numLQ, u8 numPubQ)
+static void _init_available_page_threshold(struct adapter *padapter,
+ u8 numHQ,
+ u8 numNQ,
+ u8 numLQ,
+ u8 numPubQ)
{
u16 HQ_threshold, NQ_threshold, LQ_threshold;
@@ -781,7 +789,11 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)
restore_iqk_rst = pwrpriv->bips_processing;
b2Ant = pHalData->EEPROMBluetoothAntNum == Ant_x2;
- PHY_IQCalibrate_8723B(padapter, false, restore_iqk_rst, b2Ant, pHalData->ant_path);
+ PHY_IQCalibrate_8723B(padapter,
+ false,
+ restore_iqk_rst,
+ b2Ant,
+ pHalData->ant_path);
pHalData->odmpriv.RFCalibrateInfo.bIQKInitialized = true;
hal_btcoex_IQKNotify(padapter, false);
@@ -812,7 +824,11 @@ static void CardDisableRTL8723BSdio(struct adapter *padapter)
u8 bMacPwrCtrlOn;
/* Run LPS WL RFOFF flow */
- HalPwrSeqCmdParsing(padapter, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK, rtl8723B_enter_lps_flow);
+ HalPwrSeqCmdParsing(padapter,
+ PWR_CUT_ALL_MSK,
+ PWR_FAB_ALL_MSK,
+ PWR_INTF_SDIO_MSK,
+ rtl8723B_enter_lps_flow);
/* ==== Reset digital sequence ====== */
@@ -841,7 +857,11 @@ static void CardDisableRTL8723BSdio(struct adapter *padapter)
bMacPwrCtrlOn = false; /* Disable CMD53 R/W */
rtw_hal_set_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn);
- HalPwrSeqCmdParsing(padapter, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK, rtl8723B_card_disable_flow);
+ HalPwrSeqCmdParsing(padapter,
+ PWR_CUT_ALL_MSK,
+ PWR_FAB_ALL_MSK,
+ PWR_INTF_SDIO_MSK,
+ rtl8723B_card_disable_flow);
}
u32 rtl8723bs_hal_deinit(struct adapter *padapter)
@@ -853,7 +873,10 @@ u32 rtl8723bs_hal_deinit(struct adapter *padapter)
u8 val8 = 0;
rtl8723b_set_FwPwrModeInIPS_cmd(padapter, 0x3);
- /* poll 0x1cc to make sure H2C command already finished by FW; MAC_0x1cc = 0 means H2C done by FW. */
+ /*
+ * poll 0x1cc to make sure H2C command already finished by FW;
+ * MAC_0x1cc = 0 means H2C done by FW.
+ */
do {
val8 = rtw_read8(padapter, REG_HMETFR);
cnt++;
@@ -862,10 +885,13 @@ u32 rtl8723bs_hal_deinit(struct adapter *padapter)
/* H2C done, enter 32k */
if (val8 == 0) {
/* set rpwm to enter 32k */
- val8 = rtw_read8(padapter, SDIO_LOCAL_BASE | SDIO_REG_HRPWM1);
+ val8 = rtw_read8(padapter,
+ SDIO_LOCAL_BASE | SDIO_REG_HRPWM1);
val8 += 0x80;
val8 |= BIT(0);
- rtw_write8(padapter, SDIO_LOCAL_BASE | SDIO_REG_HRPWM1, val8);
+ rtw_write8(padapter,
+ SDIO_LOCAL_BASE | SDIO_REG_HRPWM1,
+ val8);
adapter_to_pwrctl(padapter)->tog = (val8 + 0x80) & 0x80;
cnt = val8 = 0;
do {
@@ -1063,8 +1089,14 @@ static s32 _ReadAdapterInfo8723BS(struct adapter *padapter)
_ReadPROMContent(padapter);
if (!padapter->hw_init_completed) {
- rtw_write8(padapter, 0x67, 0x00); /* for BT, Switch Ant control to BT */
- CardDisableRTL8723BSdio(padapter);/* for the power consumption issue, wifi ko module is loaded during booting, but wifi GUI is off */
+ /* for BT, Switch Ant control to BT */
+ rtw_write8(padapter, 0x67, 0x00);
+
+ /*
+ * for the power consumption issue, wifi ko module is loaded during booting,
+ * but wifi GUI is off
+ */
+ CardDisableRTL8723BSdio(padapter);
}
return _SUCCESS;
--
2.54.0
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox