Skip to content

Rebase PPP onto 5.17

Tom requested to merge tomfitzhenry/linux:pine64-kernel-ppp-5.17.y into pine64-kernel-ppp-5.17.y

This MR rebases pine64-kernel-ppp-5.16.y onto v5.17.9.

This builds, and my PPP boots with it, to Phosh/sound/4G/Wifi.

Rebasing triggered some merge conflicts:

To see there are no other changes, here's the result of git range-diff:

$ git range-diff v5.16..pine64-kernel-ppp-5.16.y v5.17.9..pine64-kernel-ppp-5.17.y
 1:  16a916a0b5f1 =  1:  5fe092628ef9 base: property: Swap order of search for connection to "devcon, graph"
 2:  9927a1a8fb90 =  2:  31464d92c148 clk: rk3399: Export SCLK_CIF_OUT_SRC to device tree
 3:  f6fba19695e2 !  3:  ee6ca3949393 media: rockchip: rga: Fix probe bugs
    @@ drivers/media/platform/rockchip/rga/rga.c: static int rga_probe(struct platform_
      
        pm_runtime_enable(rga->dev);
      
    -@@ drivers/media/platform/rockchip/rga/rga.c: static int rga_probe(struct platform_device *pdev)
    -   }
    -   rga->dst_mmu_pages =
    -           (unsigned int *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, 3);
    --  if (rga->dst_mmu_pages) {
    -+  if (!rga->dst_mmu_pages) {
    -           ret = -ENOMEM;
    -           goto free_src_pages;
    -   }
 4:  2e09076590f7 =  4:  6a69b170aa35 drm: dw-mipi-dsi-rockchip: Ensure that lane is properly configured
 5:  67ccc98479aa <  -:  ------------ drm: rockchip: dw-mipi-dsi: Fix missing clk_disable_unprepare for pllref_clk
 6:  1ac6f7f95b3d =  5:  63551699d116 drm: bridge: dw-mipi-dsi: Fix enable/disable of dsi controller
 7:  d78be103fdf9 =  6:  42725d13e643 drm: dw-mipi-dsi-rockchip: Never allow lane bandwidth to be less than requested
 8:  52f5831b374f =  7:  6cc346c0003a drm: rockchip: cdn-dp: Disable CDN DP on disconnect
 9:  ca349f02f71d =  8:  4c12ad7d2c12 video: fbdev: Add events for early fb event support
10:  c816cbb1a548 =  9:  d2a908fa6e3d power: rk818: Configure `rk808-clkout2` function
11:  f86ccab633e7 = 10:  a934f2703195 power: rk818-battery: Add battery driver for RK818
12:  97f45f67b25f = 11:  3f64b9c85269 power: supply: rk818-battery: Use a more propper compatible string
13:  956333cb2748 = 12:  4b33a51ca347 power: supply: core: Don't ignore max_current of 0 when setting current limit
14:  aa2a8c9cf365 = 13:  1bbd0d46b91b power: supply: rk818-charger: Implement charger driver for RK818 PMIC
15:  c03d035959cb = 14:  38dbbfa4c969 usb: typec: fusb302: Set the current before enabling pullups
16:  9a364e5d2278 = 15:  85d888b71e38 usb: typec: fusb302: Extend debugging interface with driver state dumps
17:  1558f4e7cb3a = 16:  7e1abc44d73a usb: typec: fusb302: Retry reading of CC pins status if activity is detected
18:  dbaa012d5022 = 17:  cb8881534994 usb: typec: fusb302: More useful of logging status on interrupt
19:  a9b2791b0426 = 18:  ddec92b39423 usb: typec: fusb302: Update VBUS state even if VBUS interrupt is not triggered
20:  d9a1d687154b = 19:  b88e13b2ee42 usb: typec: fusb302: Make tcpm/fusb302 logs less polluted by PD comm stuff
21:  92c525eeafc7 = 20:  062238ad32e1 usb: typec: fusb302: Add OF extcon support
22:  77ebcd748b8e = 21:  88e72fc1b88e usb: typec: fusb302: Fix register definitions
23:  218b1d916154 = 22:  2a97a5d77eb4 usb: typec: fusb302: Clear interrupts before we start toggling
24:  faa9fb77fbfa = 23:  0183ad558dbd usb: typec: typec-extcon: Add typec -> extcon bridge driver
25:  3b2586cebc18 = 24:  2d431f1b5037 phy: rockchip-typec: Make sure the plug orientation is respected
26:  c150d7596365 = 25:  eca0ba6de762 media: i2c: imx258: Add support for powerdown gpio
27:  c181b894b659 = 26:  fc7d262a8945 media: i2c: imx258: Don't be too strict about clock rate
28:  b1a1fa891a77 = 27:  e45d741cee3d media: i2c: imx258: Add support for reset gpio
29:  0c6042885f38 = 28:  2289efc631a3 media: i2c: imx258: Add support for power supplies
30:  f2c72fd640c2 = 29:  8f5d1bf4e56f drm: panel: hx8394: Add driver for HX8394 based HannStar HSD060BHW4 panel
31:  5ba0c9ab318c = 30:  4b3979c148b9 drm: panel: hx8394: Improve the panel driver (make it work with DSI fixes)
32:  760bcb7ce3fd = 31:  981c6fbf7d00 drm: panel: hx8394: Fix mode clock for the pinephone pro panel
33:  f65fa6d4bdff = 32:  12b2be1d930e input: goodix: Add option to power off the controller during suspend
34:  8b6cfce42ff5 = 33:  639a0d960385 input: goodix: Don't disable regulators during suspend
35:  3795d1df23e9 = 34:  f119cff1850a input: touchscreen: goodix: Respect IRQ flags from DT when asked to
36:  0dd4edb52f67 = 35:  00c46c799e4e input: touchscreen: goodix: Add support for GT1158
37:  261d3b5f8ac5 = 36:  e67fea7880e7 arm64: dts: rk3399-pinephone-pro: Add support for Pinephone Pro
38:  e9fd2b73c4bb = 37:  c89b9f33389f arm64: dts: rk3399-pinephone-pro: Fixup DT validation issues
39:  b88db4c2a76d = 38:  214674cfc0fe arm64: dts: rk3399-pinephone-pro: Make charging and peripheral mode work
40:  9ca73fcd9e3d = 39:  14024e9576be arm64: dts: rk3399-pinephone-pro: Fix goodix toucscreen interrupts
41:  e304878ac19c = 40:  2afa52bd11e3 arm64: dts: rk3399-pinephone-pro: Correct the pmu1830 io-domain supply
42:  f11e4e03946a = 41:  c38926d67e94 arm64: dts: rk3399-pinephone-pro: Power off goodix touchscreen in sleep
43:  d2eafa58feac = 42:  3a6f3e369515 arm64: dts: rk3399-pinephone-pro: Add support for both cameras
44:  c288391e6c61 = 43:  fd3142ae651b arm64: dts: rk3399-pinephone-pro: Fix SD card power supply definition
45:  04154d7122f5 = 44:  0fa39f788908 arm64: dts: rk3399-pinephone-pro: Correct the battery specification
46:  4f38fa503966 = 45:  87655d9c1371 arm64: dts: rk3399-pinephone-pro: Cleanup some USB nodes whitespace
47:  c7c0f2693e16 = 46:  96f691c8da04 arm64: dts: rk3399-pinephone-pro: Fix PDOs to be more reasonable
48:  17716fc104e7 = 47:  dec08cb91623 arm64: dts: rk3399-pinephone-pro: Add chassis-type = "handset" to DT
49:  8e4de7c1363b = 48:  7a50e091beb7 arm64: dts: rk3399-pinephone-pro: Add mmc aliases to get stable numbering
50:  2d98163fa0ad = 49:  eb4be2c27911 arm64: dts: rk3399-pinephone-pro: Use a new rk818-battery compatible
51:  dd64e0b2e334 = 50:  02cbf39ebf39 arm64: dts: rk3399-pinephone-pro: Full support for Type-C port
52:  76843a31d640 = 51:  4ae9c5ffda75 arm64: dts: rk3399-pinephone-pro: Use DCLK_VOP*_FRAC to achieve precise rates
53:  9e0a233994c2 = 52:  1cb222a2bb94 arm64: dts: rk3399-pinephone-pro: Add support for powering up the modem
54:  359024599d32 = 53:  7c4b1c2ef334 arm64: dts: rk3399-pinephone-pro: Add audio support
55:  4ccf192cf9ba = 54:  c4d63ba65bc6 arm64: dts: rk3399-pinephone-pro: Add flash and fix leds
56:  c8f58f794bed = 55:  fb5cbffb2369 arm64: dts: rk3399-pinephone-pro: add modem RI pin
57:  a1c4dc377efe = 56:  0b3143f9c7d3 arm64: dts: rk3399-pinephone-pro: improve sound device definition
58:  6b553233708f = 57:  e84ccd985eac arm64: dts: rk3399-pinephone-pro: remove front camera nodes
59:  138b2bb2032e = 58:  944ade64a3db arm64: configs: add pinephonepro_defconfig
60:  ea781e4a001a = 59:  4a96ab1273f0 arm64: configs: enable REGULATOR_FAN53555
61:  f35296242432 = 60:  c1dd853aced6 mmc: dw-mmc-rockchip: fix sdmmc after soft reboot
62:  74043888b733 <  -:  ------------ mtd: spi-nor: gigadevice: add support for gd25lq128e
 -:  ------------ > 61:  372f7ac1cf9a mtd: spi-nor: gigadevice: add support for gd25lq128e
63:  879605a4b221 = 62:  b9a1518767d5 arm64: dts: rk3399-pinephone-pro: add SPI flash
64:  d0c1dba3b415 = 63:  428691890a0d arm64: configs: enable MTD
65:  7e64c574a8cc = 64:  4eec0af02817 pinctrl/rockchip: support deferring other gpio params
66:  3fe2cd69729c = 65:  214bffe5999a pinctrl/rockchip: support setting input-enable param
67:  480d1eaf1f01 = 66:  e497bec66a75 gpio/rockchip: handle deferring input-enable pinconfs
68:  cbaae8db3121 = 67:  e0cf508a7088 arm64: dts: rockchip: rk3399: add an input enable pinconf
Edited by Tom

Merge request reports