| Message ID | 20260504000431.1340150-2-laurent.pinchart@ideasonboard.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
Quoting Laurent Pinchart (2026-05-04 01:04:26) > The mali-c55-config.h header has been merged in the mainline kernel, and > is located in linux/media/arm/. Update the location of the local copy to > prepare for the next kernel headers update. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > include/linux/{ => media/arm}/mali-c55-config.h | 0 > src/ipa/mali-c55/algorithms/algorithm.h | 2 +- > src/ipa/mali-c55/mali-c55.cpp | 2 +- > src/ipa/mali-c55/module.h | 2 +- > src/ipa/mali-c55/params.h | 2 +- > src/libcamera/pipeline/mali-c55/mali-c55.cpp | 2 +- > 6 files changed, 5 insertions(+), 5 deletions(-) > rename include/linux/{ => media/arm}/mali-c55-config.h (100%) > > diff --git a/include/linux/mali-c55-config.h b/include/linux/media/arm/mali-c55-config.h > similarity index 100% > rename from include/linux/mali-c55-config.h > rename to include/linux/media/arm/mali-c55-config.h > diff --git a/src/ipa/mali-c55/algorithms/algorithm.h b/src/ipa/mali-c55/algorithms/algorithm.h > index e61115f6c2d6..ffa22cb8d23f 100644 > --- a/src/ipa/mali-c55/algorithms/algorithm.h > +++ b/src/ipa/mali-c55/algorithms/algorithm.h > @@ -7,7 +7,7 @@ > > #pragma once > > -#include <linux/mali-c55-config.h> > +#include <linux/media/arm/mali-c55-config.h> find | grep mali-c55-config.h ./include/uapi/linux/media/arm/mali-c55-config.h So for that bit Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> But I can't see any update in this patch to utils/update-kernel-headers.sh ... shouldn't that reflect the new location ? Aha wait - it's because the file isn't there yet, and it gets added in 4/6. No issue then. -- Kieran
2026. 05. 04. 2:04 keltezéssel, Laurent Pinchart írta: > The mali-c55-config.h header has been merged in the mainline kernel, and > is located in linux/media/arm/. Update the location of the local copy to > prepare for the next kernel headers update. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com> > include/linux/{ => media/arm}/mali-c55-config.h | 0 > src/ipa/mali-c55/algorithms/algorithm.h | 2 +- > src/ipa/mali-c55/mali-c55.cpp | 2 +- > src/ipa/mali-c55/module.h | 2 +- > src/ipa/mali-c55/params.h | 2 +- > src/libcamera/pipeline/mali-c55/mali-c55.cpp | 2 +- > 6 files changed, 5 insertions(+), 5 deletions(-) > rename include/linux/{ => media/arm}/mali-c55-config.h (100%) > > diff --git a/include/linux/mali-c55-config.h b/include/linux/media/arm/mali-c55-config.h > similarity index 100% > rename from include/linux/mali-c55-config.h > rename to include/linux/media/arm/mali-c55-config.h > diff --git a/src/ipa/mali-c55/algorithms/algorithm.h b/src/ipa/mali-c55/algorithms/algorithm.h > index e61115f6c2d6..ffa22cb8d23f 100644 > --- a/src/ipa/mali-c55/algorithms/algorithm.h > +++ b/src/ipa/mali-c55/algorithms/algorithm.h > @@ -7,7 +7,7 @@ > > #pragma once > > -#include <linux/mali-c55-config.h> > +#include <linux/media/arm/mali-c55-config.h> > > #include <libipa/algorithm.h> > > diff --git a/src/ipa/mali-c55/mali-c55.cpp b/src/ipa/mali-c55/mali-c55.cpp > index 3315d9a99488..1d3af0627fdb 100644 > --- a/src/ipa/mali-c55/mali-c55.cpp > +++ b/src/ipa/mali-c55/mali-c55.cpp > @@ -10,7 +10,7 @@ > #include <string.h> > #include <vector> > > -#include <linux/mali-c55-config.h> > +#include <linux/media/arm/mali-c55-config.h> > #include <linux/v4l2-controls.h> > > #include <libcamera/base/file.h> > diff --git a/src/ipa/mali-c55/module.h b/src/ipa/mali-c55/module.h > index 13b34eb28395..91b9aeb85050 100644 > --- a/src/ipa/mali-c55/module.h > +++ b/src/ipa/mali-c55/module.h > @@ -7,7 +7,7 @@ > > #pragma once > > -#include <linux/mali-c55-config.h> > +#include <linux/media/arm/mali-c55-config.h> > > #include <libcamera/ipa/mali-c55_ipa_interface.h> > > diff --git a/src/ipa/mali-c55/params.h b/src/ipa/mali-c55/params.h > index 370f1b8b77bc..64be68583ddb 100644 > --- a/src/ipa/mali-c55/params.h > +++ b/src/ipa/mali-c55/params.h > @@ -7,7 +7,7 @@ > > #pragma once > > -#include <linux/mali-c55-config.h> > +#include <linux/media/arm/mali-c55-config.h> > #include <linux/videodev2.h> > > #include <libipa/v4l2_params.h> > diff --git a/src/libcamera/pipeline/mali-c55/mali-c55.cpp b/src/libcamera/pipeline/mali-c55/mali-c55.cpp > index 69df2a39fc77..ce2469ed19c4 100644 > --- a/src/libcamera/pipeline/mali-c55/mali-c55.cpp > +++ b/src/libcamera/pipeline/mali-c55/mali-c55.cpp > @@ -13,9 +13,9 @@ > #include <string> > #include <variant> > > -#include <linux/mali-c55-config.h> > #include <linux/media-bus-format.h> > #include <linux/media.h> > +#include <linux/media/arm/mali-c55-config.h> > > #include <libcamera/base/log.h> > #include <libcamera/base/utils.h>
diff --git a/include/linux/mali-c55-config.h b/include/linux/media/arm/mali-c55-config.h similarity index 100% rename from include/linux/mali-c55-config.h rename to include/linux/media/arm/mali-c55-config.h diff --git a/src/ipa/mali-c55/algorithms/algorithm.h b/src/ipa/mali-c55/algorithms/algorithm.h index e61115f6c2d6..ffa22cb8d23f 100644 --- a/src/ipa/mali-c55/algorithms/algorithm.h +++ b/src/ipa/mali-c55/algorithms/algorithm.h @@ -7,7 +7,7 @@ #pragma once -#include <linux/mali-c55-config.h> +#include <linux/media/arm/mali-c55-config.h> #include <libipa/algorithm.h> diff --git a/src/ipa/mali-c55/mali-c55.cpp b/src/ipa/mali-c55/mali-c55.cpp index 3315d9a99488..1d3af0627fdb 100644 --- a/src/ipa/mali-c55/mali-c55.cpp +++ b/src/ipa/mali-c55/mali-c55.cpp @@ -10,7 +10,7 @@ #include <string.h> #include <vector> -#include <linux/mali-c55-config.h> +#include <linux/media/arm/mali-c55-config.h> #include <linux/v4l2-controls.h> #include <libcamera/base/file.h> diff --git a/src/ipa/mali-c55/module.h b/src/ipa/mali-c55/module.h index 13b34eb28395..91b9aeb85050 100644 --- a/src/ipa/mali-c55/module.h +++ b/src/ipa/mali-c55/module.h @@ -7,7 +7,7 @@ #pragma once -#include <linux/mali-c55-config.h> +#include <linux/media/arm/mali-c55-config.h> #include <libcamera/ipa/mali-c55_ipa_interface.h> diff --git a/src/ipa/mali-c55/params.h b/src/ipa/mali-c55/params.h index 370f1b8b77bc..64be68583ddb 100644 --- a/src/ipa/mali-c55/params.h +++ b/src/ipa/mali-c55/params.h @@ -7,7 +7,7 @@ #pragma once -#include <linux/mali-c55-config.h> +#include <linux/media/arm/mali-c55-config.h> #include <linux/videodev2.h> #include <libipa/v4l2_params.h> diff --git a/src/libcamera/pipeline/mali-c55/mali-c55.cpp b/src/libcamera/pipeline/mali-c55/mali-c55.cpp index 69df2a39fc77..ce2469ed19c4 100644 --- a/src/libcamera/pipeline/mali-c55/mali-c55.cpp +++ b/src/libcamera/pipeline/mali-c55/mali-c55.cpp @@ -13,9 +13,9 @@ #include <string> #include <variant> -#include <linux/mali-c55-config.h> #include <linux/media-bus-format.h> #include <linux/media.h> +#include <linux/media/arm/mali-c55-config.h> #include <libcamera/base/log.h> #include <libcamera/base/utils.h>
The mali-c55-config.h header has been merged in the mainline kernel, and is located in linux/media/arm/. Update the location of the local copy to prepare for the next kernel headers update. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- include/linux/{ => media/arm}/mali-c55-config.h | 0 src/ipa/mali-c55/algorithms/algorithm.h | 2 +- src/ipa/mali-c55/mali-c55.cpp | 2 +- src/ipa/mali-c55/module.h | 2 +- src/ipa/mali-c55/params.h | 2 +- src/libcamera/pipeline/mali-c55/mali-c55.cpp | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename include/linux/{ => media/arm}/mali-c55-config.h (100%)