diff mbox series

[1/4] imx: copy patches 5.15 to 6.1

Message ID 20240108212539.3271221-1-tharvey@gateworks.com
State Accepted
Headers show
Series [1/4] imx: copy patches 5.15 to 6.1 | expand

Commit Message

Tim Harvey Jan. 8, 2024, 9:25 p.m. UTC 
copy 5.15 patches excluding some that need manual rework touching
non-upstream led props.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
---
 .../linux/imx/patches-6.1/100-bootargs.patch  | 11 +++++++++
 ...-pico-pi.dts-add-default-stdout-path.patch | 23 +++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 target/linux/imx/patches-6.1/100-bootargs.patch
 create mode 100644 target/linux/imx/patches-6.1/311-ARM-imx7d-pico-pi.dts-add-default-stdout-path.patch

Comments

Lech Perczak Jan. 14, 2024, 1:26 a.m. UTC | #1 
W dniu 2024-01-08 o 22:25, Tim Harvey pisze:
> copy 5.15 patches excluding some that need manual rework touching
> non-upstream led props.
>
> Signed-off-by: Tim Harvey <tharvey@gateworks.com>
> ---
>   .../linux/imx/patches-6.1/100-bootargs.patch  | 11 +++++++++
>   ...-pico-pi.dts-add-default-stdout-path.patch | 23 +++++++++++++++++++
>   2 files changed, 34 insertions(+)
>   create mode 100644 target/linux/imx/patches-6.1/100-bootargs.patch
>   create mode 100644 target/linux/imx/patches-6.1/311-ARM-imx7d-pico-pi.dts-add-default-stdout-path.patch
>
> diff --git a/target/linux/imx/patches-6.1/100-bootargs.patch b/target/linux/imx/patches-6.1/100-bootargs.patch
> new file mode 100644
> index 000000000000..cf63a3bdb1a3
> --- /dev/null
> +++ b/target/linux/imx/patches-6.1/100-bootargs.patch
> @@ -0,0 +1,11 @@
> +--- a/arch/arm/boot/dts/imx6dl-wandboard.dts
> ++++ b/arch/arm/boot/dts/imx6dl-wandboard.dts
> +@@ -16,4 +16,8 @@
> + 		device_type = "memory";
> + 		reg = <0x10000000 0x40000000>;
> + 	};
> ++
> ++	chosen {
> ++		bootargs = "console=ttymxc0,115200";
> ++	};
> + };
> diff --git a/target/linux/imx/patches-6.1/311-ARM-imx7d-pico-pi.dts-add-default-stdout-path.patch b/target/linux/imx/patches-6.1/311-ARM-imx7d-pico-pi.dts-add-default-stdout-path.patch
> new file mode 100644
> index 000000000000..5248e8c74c1a
> --- /dev/null
> +++ b/target/linux/imx/patches-6.1/311-ARM-imx7d-pico-pi.dts-add-default-stdout-path.patch
> @@ -0,0 +1,23 @@
> +From 6e8e5ccfbee7a531b035ffce3f95f3901946fa9d Mon Sep 17 00:00:00 2001
> +From: Robert Nelson <robertcnelson@gmail.com>
> +Date: Wed, 9 Jan 2019 14:33:24 -0600
> +Subject: [PATCH] ARM: imx7d-pico-pi.dts: add default stdout-path
> +
> +Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
> +---
> + arch/arm/boot/dts/imx7d-pico-pi.dts | 4 ++++
> + 1 file changed, 4 insertions(+)
> +
> +--- a/arch/arm/boot/dts/imx7d-pico-pi.dts
> ++++ b/arch/arm/boot/dts/imx7d-pico-pi.dts
> +@@ -16,6 +16,10 @@
> + 		label-mac-device = &fec1;
> + 	};
> +
> ++	chosen {
> ++		stdout-path = "serial4:115200n8";
> ++	};
> ++
> + 	leds {
> + 		compatible = "gpio-leds";
> + 		pinctrl-names = "default";

Hi Tim,

In an effort to get camera working on Pico Pi i.MX7 board, I rebased the 
remaining patches and put that on Github:
https://github.com/Leo-PL/openwrt/commits/pico-pi-imx7-camera-6.1/

Feel free to integrate them.
Tim Harvey Jan. 16, 2024, 11:37 p.m. UTC | #2 
On Sat, Jan 13, 2024 at 5:26 PM Lech Perczak <lech.perczak@gmail.com> wrote:
>
> W dniu 2024-01-08 o 22:25, Tim Harvey pisze:
> > copy 5.15 patches excluding some that need manual rework touching
> > non-upstream led props.
> >
> > Signed-off-by: Tim Harvey <tharvey@gateworks.com>
> > ---
> >   .../linux/imx/patches-6.1/100-bootargs.patch  | 11 +++++++++
> >   ...-pico-pi.dts-add-default-stdout-path.patch | 23 +++++++++++++++++++
> >   2 files changed, 34 insertions(+)
> >   create mode 100644 target/linux/imx/patches-6.1/100-bootargs.patch
> >   create mode 100644 target/linux/imx/patches-6.1/311-ARM-imx7d-pico-pi.dts-add-default-stdout-path.patch
> >
> > diff --git a/target/linux/imx/patches-6.1/100-bootargs.patch b/target/linux/imx/patches-6.1/100-bootargs.patch
> > new file mode 100644
> > index 000000000000..cf63a3bdb1a3
> > --- /dev/null
> > +++ b/target/linux/imx/patches-6.1/100-bootargs.patch
> > @@ -0,0 +1,11 @@
> > +--- a/arch/arm/boot/dts/imx6dl-wandboard.dts
> > ++++ b/arch/arm/boot/dts/imx6dl-wandboard.dts
> > +@@ -16,4 +16,8 @@
> > +             device_type = "memory";
> > +             reg = <0x10000000 0x40000000>;
> > +     };
> > ++
> > ++    chosen {
> > ++            bootargs = "console=ttymxc0,115200";
> > ++    };
> > + };
> > diff --git a/target/linux/imx/patches-6.1/311-ARM-imx7d-pico-pi.dts-add-default-stdout-path.patch b/target/linux/imx/patches-6.1/311-ARM-imx7d-pico-pi.dts-add-default-stdout-path.patch
> > new file mode 100644
> > index 000000000000..5248e8c74c1a
> > --- /dev/null
> > +++ b/target/linux/imx/patches-6.1/311-ARM-imx7d-pico-pi.dts-add-default-stdout-path.patch
> > @@ -0,0 +1,23 @@
> > +From 6e8e5ccfbee7a531b035ffce3f95f3901946fa9d Mon Sep 17 00:00:00 2001
> > +From: Robert Nelson <robertcnelson@gmail.com>
> > +Date: Wed, 9 Jan 2019 14:33:24 -0600
> > +Subject: [PATCH] ARM: imx7d-pico-pi.dts: add default stdout-path
> > +
> > +Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
> > +---
> > + arch/arm/boot/dts/imx7d-pico-pi.dts | 4 ++++
> > + 1 file changed, 4 insertions(+)
> > +
> > +--- a/arch/arm/boot/dts/imx7d-pico-pi.dts
> > ++++ b/arch/arm/boot/dts/imx7d-pico-pi.dts
> > +@@ -16,6 +16,10 @@
> > +             label-mac-device = &fec1;
> > +     };
> > +
> > ++    chosen {
> > ++            stdout-path = "serial4:115200n8";
> > ++    };
> > ++
> > +     leds {
> > +             compatible = "gpio-leds";
> > +             pinctrl-names = "default";
>
> Hi Tim,
>
> In an effort to get camera working on Pico Pi i.MX7 board, I rebased the
> remaining patches and put that on Github:
> https://github.com/Leo-PL/openwrt/commits/pico-pi-imx7-camera-6.1/
>
> Feel free to integrate them.
>

Thanks - good to know someone is interested in this!

Is there someone we can cc with commit access that can review and
merge these? It looks to me like your patches can just go right on top
of mine. I'm unclear as to how much testing/feedback is needed before
we can switch the kernel from 5.15 to 6.1. I've tested it on an imx6
board, and you've tested it on an imx7 board so perhaps that is
enough.

Can you explain how do you go about coming up with your config-default
changes? I'm not a big fan of the config-default files over each
subtarget simply having its own defconfig but perhaps it's because I'm
unclear how to create and update the config-default.

Best Regards,

Tim
diff mbox series

Patch

diff --git a/target/linux/imx/patches-6.1/100-bootargs.patch b/target/linux/imx/patches-6.1/100-bootargs.patch
new file mode 100644
index 000000000000..cf63a3bdb1a3
--- /dev/null
+++ b/target/linux/imx/patches-6.1/100-bootargs.patch
@@ -0,0 +1,11 @@ 
+--- a/arch/arm/boot/dts/imx6dl-wandboard.dts
++++ b/arch/arm/boot/dts/imx6dl-wandboard.dts
+@@ -16,4 +16,8 @@
+ 		device_type = "memory";
+ 		reg = <0x10000000 0x40000000>;
+ 	};
++
++	chosen {
++		bootargs = "console=ttymxc0,115200";
++	};
+ };
diff --git a/target/linux/imx/patches-6.1/311-ARM-imx7d-pico-pi.dts-add-default-stdout-path.patch b/target/linux/imx/patches-6.1/311-ARM-imx7d-pico-pi.dts-add-default-stdout-path.patch
new file mode 100644
index 000000000000..5248e8c74c1a
--- /dev/null
+++ b/target/linux/imx/patches-6.1/311-ARM-imx7d-pico-pi.dts-add-default-stdout-path.patch
@@ -0,0 +1,23 @@ 
+From 6e8e5ccfbee7a531b035ffce3f95f3901946fa9d Mon Sep 17 00:00:00 2001
+From: Robert Nelson <robertcnelson@gmail.com>
+Date: Wed, 9 Jan 2019 14:33:24 -0600
+Subject: [PATCH] ARM: imx7d-pico-pi.dts: add default stdout-path
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ arch/arm/boot/dts/imx7d-pico-pi.dts | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/arch/arm/boot/dts/imx7d-pico-pi.dts
++++ b/arch/arm/boot/dts/imx7d-pico-pi.dts
+@@ -16,6 +16,10 @@
+ 		label-mac-device = &fec1;
+ 	};
+ 
++	chosen {
++		stdout-path = "serial4:115200n8";
++	};
++
+ 	leds {
+ 		compatible = "gpio-leds";
+ 		pinctrl-names = "default";