Skip to content
Snippets Groups Projects

linux-postmarketos-omap: Update to 6.9.3

Merged Imported Administrator requested to merge omap-6.9.0-r1 into master

Enabled CONFIG_NLS_ASCII - #2874 (closed)

Revert logic for iio-rescale.c - https://lore.kernel.org/all/20220524075448.140238-1-linus.walleij@linaro.org/ Enables light and proximity sensor!

Fix whiteline issues

Remove patch for power controller as it is mainlined - #2825 (closed)

Update to 6.9.3

TODO:

It would be great if we get this merged into v24.06

Edited by Administrator

Merge request reports

Checking pipeline status.

Merged by AdministratorAdministrator 9 months ago (Jun 10, 2024 5:58pm UTC)

Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Administrator mentioned in merge request !5214 (closed) · Imported

    mentioned in merge request !5214 (closed)

    By Andreas Kemnade on 2024-06-08T13:40:04

  • Author Owner

    accepted patch for twl 32k clock for embt2ws is here: https://lore.kernel.org/lkml/20230916100515.1650336-6-andreas@kemnade.info/

    the one mentioned in the summary is outdated.

    By Andreas Kemnade on 2024-06-08T14:13:32

    Edited by Ghost User
  • Administrator changed the description · Imported

    changed the description

    By Mighty on 2024-06-08T14:13:47

  • Administrator changed title from linux-postmarketos-omap: Update to 6.9.0-rc1 to linux-postmarketos-omap: Update to 6.9.0-r1 · Imported

    changed title from linux-postmarketos-omap: Update to 6.9.0-rc1 to linux-postmarketos-omap: Update to 6.9.0-r1

    By Mighty on 2024-06-08T14:45:20

  • Administrator marked the checklist item Check clk32kg - https://lore.kernel.org/lkml/20230916100515.1650336-6-andreas@kemnade.info/ as completed · Imported

    marked the checklist item Check clk32kg - https://lore.kernel.org/lkml/20230916100515.1650336-6-andreas@kemnade.info/ as completed

    By Mighty on 2024-06-09T06:38:19

  • Administrator added 2 commits · Imported

    added 2 commits

    • 8ccbf6a4 - linux-postmarketos-omap: espresso-common: Remove twl6030 import and use upstreamed clk32kg for wlan
    • 59a0b2ee - linux-postmarketos-omap: Update pkgver and checksums

    Compare with previous version

    By Mighty on 2024-06-09T06:38:51

  • Administrator added 7 commits · Imported

    added 7 commits

    • 647f2bc6 - 1 commit from branch postmarketOS:master
    • c19988ea - linux-postmarketos-omap: Use upstreamed power controller for espresso
    • 5dd182f0 - linux-postmarketos-omap: Fix whiteline issues for patches
    • 07c56e7e - linux-postmarketos-omap: Include patch for iio-rescale logic
    • c7acd1f2 - linux-postmarketos-omap: Enable CONFIG_NLS_ASCII
    • 2a658b54 - linux-postmarketos-omap: espresso-common: Remove twl6030 import and use upstreamed clk32kg for wlan
    • 253d3d23 - linux-postmarketos-omap: Update pkgver and checksums

    Compare with previous version

    By Mighty on 2024-06-09T06:39:09

  • Administrator changed the description · Imported

    changed the description

    By Mighty on 2024-06-09T06:41:49

    • Author Owner
      Resolved by Administrator

      Thank you very much! The diff looks good to me. Not merging yet because "Check it works fine on other omap devices" is not checked - but in general I'd be fine with shipping this in v24.06.

      The individual commits need some work, but this could also be done when we merge this. Either squash all commits, or fix these:

      • patch linux-postmarketos-omap: Include patch for iio-rescale logic deletes the APKBUILD
      • update pkgver and checksums: should be squashed / doesn't actually bump the pkgrel

      By Oliver Smith on 2024-06-09T18:09:32

      Edited by Ghost User
  • Administrator approved this merge request · Imported

    approved this merge request

    By Oliver Smith on 2024-06-09T14:14:31

    • Author Owner
      Resolved by Administrator

      Oh just realized that CI failed, so this would need to be fixed first:

      arch/arm/boot/dts/ti/omap/omap4-samsung-espresso-common.dtsi:547.19-557.4: ERROR (phandle_references): /ocp/interconnect@48000000/segment@200000/target-module@150000/i2c@0/accelerometer@18: Reference to non-existent node or label "ldo5"
      arch/arm/boot/dts/ti/omap/omap4-samsung-espresso-common.dtsi:559.18-566.7: ERROR (phandle_references): /ocp/interconnect@48000000/segment@200000/target-module@150000/i2c@0/magnetometer@2e: Reference to non-existent node or label "ldo5"
      arch/arm/boot/dts/ti/omap/omap4-samsung-espresso-common.dtsi:247.34-254.4: ERROR (phandle_references): /current-sense-shunt: Reference to non-existent node or label "gpadc"
      ERROR: Input tree has errors, aborting (use -f to force output)
      make[4]: *** [scripts/Makefile.lib:427: arch/arm/boot/dts/ti/omap/omap4-samsung-espresso7.dtb] Error 2
      make[3]: *** [scripts/Makefile.build:485: arch/arm/boot/dts/ti/omap] Error 2
      make[2]: *** [scripts/Makefile.build:485: arch/arm/boot/dts/ti] Error 2
      make[1]: *** [/home/pmos/build/src/linux-6.9/Makefile:1394: dtbs] Error 2
      make[1]: *** Waiting for unfinished jobs....
      

      By Oliver Smith on 2024-06-09T19:47:53

      Edited by Ghost User
  • Administrator unapproved this merge request · Imported

    unapproved this merge request

    By Oliver Smith on 2024-06-09T14:15:49

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading