From 211c844c0f344958ed655fbff37e8adb97ccc5a8 Mon Sep 17 00:00:00 2001 From: Gerben Jan Dijkman Date: Tue, 14 Jun 2022 12:37:20 +0200 Subject: [PATCH] Version Upgrade --- sys-kernel/pinephone-sources/Manifest | 8 +- ...l-org-bug-210681-firmware_rome_error.patch | 12 - ...pio-make-max_brightness-configurable.patch | 49 --- ...ent-clocks-to-lower-speed-oscillator.patch | 50 --- sys-kernel/pinephone-sources/files/config-pp | 0 .../pinephone-sources/files/dracut-pp.conf | 0 .../dts-pinephone-drop-modem-power-node.patch | 0 .../media-ov5640-Implement-autofocus.patch | 409 ------------------ .../pinephone-sources/files/panic-led.patch | 12 - ...ebuild => pinephone-sources-5.18.3.ebuild} | 13 +- 10 files changed, 6 insertions(+), 547 deletions(-) mode change 100644 => 100755 sys-kernel/pinephone-sources/Manifest delete mode 100644 sys-kernel/pinephone-sources/files/0107-quirk-kernel-org-bug-210681-firmware_rome_error.patch delete mode 100644 sys-kernel/pinephone-sources/files/0177-leds-gpio-make-max_brightness-configurable.patch delete mode 100644 sys-kernel/pinephone-sources/files/ccu-sun50i-a64-reparent-clocks-to-lower-speed-oscillator.patch mode change 100644 => 100755 sys-kernel/pinephone-sources/files/config-pp mode change 100644 => 100755 sys-kernel/pinephone-sources/files/dracut-pp.conf mode change 100644 => 100755 sys-kernel/pinephone-sources/files/dts-pinephone-drop-modem-power-node.patch delete mode 100644 sys-kernel/pinephone-sources/files/media-ov5640-Implement-autofocus.patch delete mode 100644 sys-kernel/pinephone-sources/files/panic-led.patch rename sys-kernel/pinephone-sources/{pinephone-sources-5.16.2.ebuild => pinephone-sources-5.18.3.ebuild} (70%) mode change 100644 => 100755 diff --git a/sys-kernel/pinephone-sources/Manifest b/sys-kernel/pinephone-sources/Manifest old mode 100644 new mode 100755 index 62110f4..6cf1551 --- a/sys-kernel/pinephone-sources/Manifest +++ b/sys-kernel/pinephone-sources/Manifest @@ -1,4 +1,4 @@ -DIST all-5.16.2.patch 16105546 BLAKE2B 2faea3e479545d351aedad3dac10b979df25e088f5b2a4e5f97d3ed68cbbdd4f1ef4f877b811aca0ecf9169dbf006e4b6ce23bd46cb13530a7a04da216f3d32d SHA512 b612f0d93389e677b50092e4f8befb4201a4b9ca28c374d92b39493d7f2163f62ad8564b72aabd968146e5c743447f74ba57c6aa026115a28bff9a649282ac9d -DIST genpatches-5.16-3.base.tar.xz 27568 BLAKE2B 506c36ca597adde1cff11c4a83f1da3dfdc5ec692b932d07fd1e3145291b9f0007ea7fc86c9706ff8b609890b57aa46c224f05c2c3ba3212930bba04b2856d12 SHA512 c740ca5a6820acc94d7aacd03414ce7a9095c6924a3168865dfced1a8eeed3a22039ed5a449571888f16636fc274d6d680748cd919899782bdf02a5460f17823 -DIST genpatches-5.16-3.extras.tar.xz 3780 BLAKE2B 4a4a4c50a4f76363f5701e9166470cca41bc5f34d0f9798eb68cf930d8b9799303553dd127dcd8bc73ba5c4784cf71dcf0c27e77ca146ef9645bc1a0044920cc SHA512 afcb6de6a98390b848708d1b22ea3d8e2f45ad7ed85d64be1f64618b65ca3a21e9011d8a9fb03d83f4630b95bd616507c8c12afcfe1841d032eea7d195ddfcd0 -DIST linux-5.16.tar.xz 123114100 BLAKE2B 07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb SHA512 7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf +DIST all-5.18.3.patch 16908878 BLAKE2B 6eae9430fff2702af7fde8cc16bffcccb100b02ed155c88e886b557d5dd26f3b091f0255ef96accbc512bb70875c4b1bd9af1b089a9439b59618dbb839014371 SHA512 2f4fca905f8bc721bc5d5fc027bbd01b8af559d806df3180141b7705538d8fdd4d65aab1fa6c5bca58e8b2423904098ef73afa43b5b700c24074347c15691b03 +DIST genpatches-5.18-5.base.tar.xz 330636 BLAKE2B 6be3ebe1f59f9305fc3f153351610b30e42ff77d6c5915a31750de58b3621956c0b621179f36958625dec111a8e8affb923ab2757a7d82f512f709482de731f8 SHA512 5aca67052e1e2e386a974ef7c713fc1c69f88622105825a51202ad5d4692d712077c6528520197b38713d03f5111c5f16ac20a4be581370d832b2b20c2a33af8 +DIST genpatches-5.18-5.extras.tar.xz 3924 BLAKE2B 078d265e4097da325de808822789cca1e6f353d44fc938e6d31f28c7d0790a83ecc9a05a9ab9894d3e1b9091643a0f7a243755718120cf1c782a486c21134130 SHA512 b614382c090deb2321dba4d2914e7b0cd34bf9b135457fb13f59a80e3351437cd0d832b8f803358e5e1c06b0da3ad38e432e09b5d722afb0f8de9094197426c1 +DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5 diff --git a/sys-kernel/pinephone-sources/files/0107-quirk-kernel-org-bug-210681-firmware_rome_error.patch b/sys-kernel/pinephone-sources/files/0107-quirk-kernel-org-bug-210681-firmware_rome_error.patch deleted file mode 100644 index 7f46da7..0000000 --- a/sys-kernel/pinephone-sources/files/0107-quirk-kernel-org-bug-210681-firmware_rome_error.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c -index 03b83aa91277..dfc6c7d1b0e7 100644 ---- a/drivers/bluetooth/btusb.c -+++ b/drivers/bluetooth/btusb.c -@@ -4070,6 +4070,7 @@ static int btusb_setup_qca(struct hci_dev *hdev) - } - if (!info) { - bt_dev_err(hdev, "don't support firmware rome 0x%x", ver_rom); -+ if (ver_rom & ~0xffffU) return 0; - return -ENODEV; - } - diff --git a/sys-kernel/pinephone-sources/files/0177-leds-gpio-make-max_brightness-configurable.patch b/sys-kernel/pinephone-sources/files/0177-leds-gpio-make-max_brightness-configurable.patch deleted file mode 100644 index e844fce..0000000 --- a/sys-kernel/pinephone-sources/files/0177-leds-gpio-make-max_brightness-configurable.patch +++ /dev/null @@ -1,49 +0,0 @@ -From cb408fb65a08bd45543724c1e9b8f38ae1bebc4a Mon Sep 17 00:00:00 2001 -From: Arnaud Ferraris -Date: Tue, 4 Aug 2020 15:12:59 +0200 -Subject: [PATCH 177/183] leds-gpio: make max_brightness configurable - ---- - drivers/leds/leds-gpio.c | 4 ++++ - include/linux/leds.h | 3 ++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c -index 93f5b1b60fde..f8483fab1164 100644 ---- a/drivers/leds/leds-gpio.c -+++ b/drivers/leds/leds-gpio.c -@@ -108,6 +108,8 @@ static int create_gpio_led(const struct gpio_led *template, - if (ret < 0) - return ret; - -+ led_dat->cdev.max_brightness = template->max_brightness; -+ - if (template->name) { - led_dat->cdev.name = template->name; - ret = devm_led_classdev_register(parent, &led_dat->cdev); -@@ -177,6 +179,8 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev) - if (fwnode_property_present(child, "panic-indicator")) - led.panic_indicator = 1; - -+ fwnode_property_read_u32(child, "max-brightness", &led.max_brightness); -+ - ret = create_gpio_led(&led, led_dat, dev, child, NULL); - if (ret < 0) { - fwnode_handle_put(child); -diff --git a/include/linux/leds.h b/include/linux/leds.h -index 6a8d6409c993..99a80092114d 100644 ---- a/include/linux/leds.h -+++ b/include/linux/leds.h -@@ -513,7 +513,8 @@ typedef int (*gpio_blink_set_t)(struct gpio_desc *desc, int state, - struct gpio_led { - const char *name; - const char *default_trigger; -- unsigned gpio; -+ unsigned gpio; -+ unsigned max_brightness; - unsigned active_low : 1; - unsigned retain_state_suspended : 1; - unsigned panic_indicator : 1; --- -2.30.0 - diff --git a/sys-kernel/pinephone-sources/files/ccu-sun50i-a64-reparent-clocks-to-lower-speed-oscillator.patch b/sys-kernel/pinephone-sources/files/ccu-sun50i-a64-reparent-clocks-to-lower-speed-oscillator.patch deleted file mode 100644 index 2a16042..0000000 --- a/sys-kernel/pinephone-sources/files/ccu-sun50i-a64-reparent-clocks-to-lower-speed-oscillator.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-a64.c b/drivers/clk/sunxi-ng/ccu-sun50i-a64.c -index 149cfde817cb..0399d8714fd0 100644 ---- a/drivers/clk/sunxi-ng/ccu-sun50i-a64.c -+++ b/drivers/clk/sunxi-ng/ccu-sun50i-a64.c -@@ -984,6 +984,8 @@ static int sun50i_a64_ccu_probe(struct p - if (IS_ERR(reg)) - return PTR_ERR(reg); - -+ platform_set_drvdata(pdev, reg); -+ - /* Force the pll-audio variable divider to 3 */ - val = readl(reg + SUN50I_A64_PLL_AUDIO_REG); - val &= ~GENMASK(19, 16); -@@ -1031,12 +1031,36 @@ static const struct of_device_id sun50i_ - { } - }; - -+#define USBPHY_CFG_REG 0x0cc -+ -+static int sun50i_a64_ccu_suspend(struct device *dev) -+{ -+ void __iomem *reg = dev_get_drvdata(dev); -+ -+ writel(readl(reg + USBPHY_CFG_REG) | 0xa00000, reg + USBPHY_CFG_REG); -+ -+ return 0; -+} -+ -+static int sun50i_a64_ccu_resume(struct device *dev) -+{ -+ void __iomem *reg = dev_get_drvdata(dev); -+ -+ writel(readl(reg + USBPHY_CFG_REG) & ~0xa00000, reg + USBPHY_CFG_REG); -+ -+ return 0; -+} -+ -+static SIMPLE_DEV_PM_OPS(sun50i_a64_ccu_pm_ops, -+ sun50i_a64_ccu_suspend, sun50i_a64_ccu_resume); -+ - static struct platform_driver sun50i_a64_ccu_driver = { - .probe = sun50i_a64_ccu_probe, - .driver = { - .name = "sun50i-a64-ccu", - .suppress_bind_attrs = true, - .of_match_table = sun50i_a64_ccu_ids, -+ .pm = &sun50i_a64_ccu_pm_ops, - }, - }; - builtin_platform_driver(sun50i_a64_ccu_driver); diff --git a/sys-kernel/pinephone-sources/files/config-pp b/sys-kernel/pinephone-sources/files/config-pp old mode 100644 new mode 100755 diff --git a/sys-kernel/pinephone-sources/files/dracut-pp.conf b/sys-kernel/pinephone-sources/files/dracut-pp.conf old mode 100644 new mode 100755 diff --git a/sys-kernel/pinephone-sources/files/dts-pinephone-drop-modem-power-node.patch b/sys-kernel/pinephone-sources/files/dts-pinephone-drop-modem-power-node.patch old mode 100644 new mode 100755 diff --git a/sys-kernel/pinephone-sources/files/media-ov5640-Implement-autofocus.patch b/sys-kernel/pinephone-sources/files/media-ov5640-Implement-autofocus.patch deleted file mode 100644 index 68c6581..0000000 --- a/sys-kernel/pinephone-sources/files/media-ov5640-Implement-autofocus.patch +++ /dev/null @@ -1,409 +0,0 @@ -From f062022f2a2781d6b8ca63c460b0e72ebac30870 Mon Sep 17 00:00:00 2001 -From: Martijn Braam -Date: Mon, 28 Sep 2020 14:26:11 +0200 -Subject: [PATCH] media: ov5640: Implement autofocus - -The autofocus functionality needs a firmware blob loaded into the -internal microcontroller. - -V4L2 doesn't have an api to control all autofocus functionality, but -this at least makes it possible to focus on the center of the sensor. - -Signed-off-by: Martijn Braam ---- - drivers/media/i2c/ov5640.c | 254 +++++++++++++++++++++++++++++++++++++ - 1 file changed, 254 insertions(+) - -diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c -index df0a507c211f..08a5304c0e95 100644 ---- a/drivers/media/i2c/ov5640.c -+++ b/drivers/media/i2c/ov5640.c -@@ -9,6 +9,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -31,7 +32,11 @@ - - #define OV5640_DEFAULT_SLAVE_ID 0x3c - -+#define OV5640_REG_SYS_RESET00 0x3000 -+#define OV5640_REG_SYS_RESET01 0x3001 - #define OV5640_REG_SYS_RESET02 0x3002 -+#define OV5640_REG_SYS_CLOCK_ENABLE00 0x3004 -+#define OV5640_REG_SYS_CLOCK_ENABLE01 0x3005 - #define OV5640_REG_SYS_CLOCK_ENABLE02 0x3006 - #define OV5640_REG_SYS_CTRL0 0x3008 - #define OV5640_REG_SYS_CTRL0_SW_PWDN 0x42 -@@ -41,6 +46,14 @@ - #define OV5640_REG_PAD_OUTPUT_ENABLE01 0x3017 - #define OV5640_REG_PAD_OUTPUT_ENABLE02 0x3018 - #define OV5640_REG_PAD_OUTPUT00 0x3019 -+#define OV5640_REG_FW_CMD_MAIN 0x3022 -+#define OV5640_REG_FW_CMD_ACK 0x3023 -+#define OV5640_REG_FW_CMD_PARA0 0x3024 -+#define OV5640_REG_FW_CMD_PARA1 0x3025 -+#define OV5640_REG_FW_CMD_PARA2 0x3026 -+#define OV5640_REG_FW_CMD_PARA3 0x3027 -+#define OV5640_REG_FW_CMD_PARA4 0x3028 -+#define OV5640_REG_FW_STATUS 0x3029 - #define OV5640_REG_SYSTEM_CONTROL1 0x302e - #define OV5640_REG_SC_PLL_CTRL0 0x3034 - #define OV5640_REG_SC_PLL_CTRL1 0x3035 -@@ -59,6 +72,7 @@ - #define OV5640_REG_AEC_PK_MANUAL 0x3503 - #define OV5640_REG_AEC_PK_REAL_GAIN 0x350a - #define OV5640_REG_AEC_PK_VTS 0x350c -+#define OV5640_REG_VCM_CONTROL4 0x3606 - #define OV5640_REG_TIMING_DVPHO 0x3808 - #define OV5640_REG_TIMING_DVPVO 0x380a - #define OV5640_REG_TIMING_HTS 0x380c -@@ -95,6 +109,20 @@ - #define OV5640_REG_SDE_CTRL4 0x5584 - #define OV5640_REG_SDE_CTRL5 0x5585 - #define OV5640_REG_AVG_READOUT 0x56a1 -+#define OV5640_REG_FIRMWARE_BASE 0x8000 -+ -+#define OV5640_FW_STATUS_S_FIRMWARE 0x7f -+#define OV5640_FW_STATUS_S_STARTUP 0x7e -+#define OV5640_FW_STATUS_S_IDLE 0x70 -+#define OV5640_FW_STATUS_S_FOCUSING 0x00 -+#define OV5640_FW_STATUS_S_FOCUSED 0x10 -+ -+#define OV5640_FW_CMD_TRIGGER_FOCUS 0x03 -+#define OV5640_FW_CMD_CONTINUOUS_FOCUS 0x04 -+#define OV5640_FW_CMD_GET_FOCUS_RESULT 0x07 -+#define OV5640_FW_CMD_RELEASE_FOCUS 0x08 -+#define OV5640_FW_CMD_ZONE_CONFIG 0x12 -+#define OV5640_FW_CMD_DEFAULT_ZONES 0x80 - - enum ov5640_mode_id { - OV5640_MODE_QCIF_176_144 = 0, -@@ -218,6 +246,12 @@ struct ov5640_ctrls { - struct v4l2_ctrl *auto_gain; - struct v4l2_ctrl *gain; - }; -+ struct { -+ struct v4l2_ctrl *focus_auto; -+ struct v4l2_ctrl *af_start; -+ struct v4l2_ctrl *af_stop; -+ struct v4l2_ctrl *af_status; -+ }; - struct v4l2_ctrl *brightness; - struct v4l2_ctrl *light_freq; - struct v4l2_ctrl *saturation; -@@ -261,6 +295,8 @@ struct ov5640_dev { - - bool pending_mode_change; - bool streaming; -+ -+ bool af_initialized; - }; - - static inline struct ov5640_dev *to_ov5640_dev(struct v4l2_subdev *sd) -@@ -1967,6 +2003,118 @@ static void ov5640_reset(struct ov5640_dev *sensor) - usleep_range(20000, 25000); - } - -+static int ov5640_copy_fw_to_device(struct ov5640_dev *sensor, -+ const struct firmware *fw) -+{ -+ struct i2c_client *client = sensor->i2c_client; -+ const u8 *data = (const u8 *)fw->data; -+ u8 fw_status; -+ int i; -+ int ret; -+ -+ // Putting MCU in reset state -+ ret = ov5640_write_reg(sensor, OV5640_REG_SYS_RESET00, 0x20); -+ if (ret) -+ return ret; -+ -+ // Write firmware -+ for (i = 0; i < fw->size / sizeof(u8); i++) -+ ov5640_write_reg(sensor, -+ OV5640_REG_FIRMWARE_BASE + i, -+ data[i]); -+ -+ // Reset MCU state -+ ov5640_write_reg(sensor, OV5640_REG_FW_CMD_MAIN, 0x00); -+ ov5640_write_reg(sensor, OV5640_REG_FW_CMD_ACK, 0x00); -+ ov5640_write_reg(sensor, OV5640_REG_FW_CMD_PARA0, 0x00); -+ ov5640_write_reg(sensor, OV5640_REG_FW_CMD_PARA1, 0x00); -+ ov5640_write_reg(sensor, OV5640_REG_FW_CMD_PARA2, 0x00); -+ ov5640_write_reg(sensor, OV5640_REG_FW_CMD_PARA3, 0x00); -+ ov5640_write_reg(sensor, OV5640_REG_FW_CMD_PARA4, 0x00); -+ ov5640_write_reg(sensor, OV5640_REG_FW_STATUS, 0x7f); -+ -+ // Start AF MCU -+ ret = ov5640_write_reg(sensor, OV5640_REG_SYS_RESET00, 0x00); -+ if (ret) -+ return ret; -+ -+ dev_info(&client->dev, "firmware upload success\n"); -+ -+ // Wait for firmware to be ready -+ for (i = 0; i < 5; i++) { -+ ret = ov5640_read_reg(sensor, OV5640_REG_FW_STATUS, &fw_status); -+ if (fw_status == OV5640_FW_STATUS_S_IDLE) { -+ dev_info(&client->dev, "fw started after %d ms\n", i * 50); -+ return ret; -+ } -+ msleep(50); -+ } -+ dev_err(&client->dev, "uploaded firmware didn't start, got to 0x%x, retrying...\n", fw_status); -+ -+ // Putting MCU in reset state -+ ret = ov5640_write_reg(sensor, OV5640_REG_SYS_RESET00, 0x20); -+ if (ret) -+ return ret; -+ // Start AF MCU -+ ret = ov5640_write_reg(sensor, OV5640_REG_SYS_RESET00, 0x00); -+ if (ret) -+ return ret; -+ // Wait for firmware to be ready -+ for (i = 0; i < 5; i++) { -+ ret = ov5640_read_reg(sensor, OV5640_REG_FW_STATUS, &fw_status); -+ if (fw_status == OV5640_FW_STATUS_S_IDLE) { -+ dev_info(&client->dev, "fw started after %d ms\n", i * 50); -+ return ret; -+ } -+ msleep(50); -+ } -+ dev_err(&client->dev, "uploaded firmware didn't start, got to 0x%x\n", fw_status); -+ return -ETIMEDOUT; -+} -+ -+static int ov5640_af_init(struct ov5640_dev *sensor) -+{ -+ struct i2c_client *client = sensor->i2c_client; -+ const char* fwname = "ov5640_af.bin"; -+ const struct firmware *fw; -+ int ret; -+ -+ if (sensor->af_initialized) { -+ return 0; -+ } -+ -+ if (firmware_request_nowarn(&fw, fwname, &client->dev) == 0) { -+ ret = ov5640_copy_fw_to_device(sensor, fw); -+ if (ret == 0) -+ sensor->af_initialized = 1; -+ } else { -+ dev_warn(&client->dev, "%s: no autofocus firmware available (%s)\n", -+ __func__, fwname); -+ ret = -1; -+ } -+ release_firmware(fw); -+ -+ if (ret) -+ return ret; -+ -+ // Enable AF systems -+ ret = ov5640_mod_reg(sensor, OV5640_REG_SYS_CLOCK_ENABLE00, -+ (BIT(6) | BIT(5)), (BIT(6) | BIT(5))); -+ if (ret) -+ return ret; -+ ret = ov5640_mod_reg(sensor, OV5640_REG_SYS_CLOCK_ENABLE01, -+ BIT(6), BIT(6)); -+ if (ret) -+ return ret; -+ -+ // Set lens focus driver on -+ ov5640_write_reg(sensor, OV5640_REG_VCM_CONTROL4, 0x3f); -+ if (ret) -+ return ret; -+ -+ return ret; -+} -+ - static int ov5640_set_power_on(struct ov5640_dev *sensor) - { - struct i2c_client *client = sensor->i2c_client; -@@ -1988,6 +2117,8 @@ static int ov5640_set_power_on(struct ov5640_dev *sensor) - goto xclk_off; - } - -+ sensor->af_initialized = 0; -+ - ov5640_reset(sensor); - ov5640_power(sensor, true); - -@@ -2416,6 +2547,35 @@ static int ov5640_set_framefmt(struct ov5640_dev *sensor, - is_jpeg ? (BIT(5) | BIT(3)) : 0); - } - -+static int ov5640_fw_command(struct ov5640_dev *sensor, int command) -+{ -+ u8 fw_ack; -+ int i; -+ int ret; -+ -+ ret = ov5640_write_reg(sensor, OV5640_REG_FW_CMD_ACK, 0x01); -+ if(ret) -+ return ret; -+ -+ ret = ov5640_write_reg(sensor, OV5640_REG_FW_CMD_MAIN, command); -+ if(ret) -+ return ret; -+ -+ for (i = 0; i < 100; i++) { -+ ret = ov5640_read_reg(sensor, OV5640_REG_FW_CMD_ACK, &fw_ack); -+ if (ret) -+ return ret; -+ -+ if (fw_ack == 0){ -+ return ret; -+ } -+ -+ msleep(50); -+ } -+ return -ETIMEDOUT; -+} -+ -+ - /* - * Sensor Controls. - */ -@@ -2532,6 +2692,41 @@ static int ov5640_set_ctrl_exposure(struct ov5640_dev *sensor, - return ret; - } - -+static int ov5640_set_ctrl_focus(struct ov5640_dev *sensor, int command) -+{ -+ struct i2c_client *client = sensor->i2c_client; -+ int ret; -+ -+ ret = ov5640_af_init(sensor); -+ if (ret) { -+ dev_err(&client->dev, "%s: no autofocus firmware loaded\n", -+ __func__); -+ return 0; -+ } -+ -+ if (command == OV5640_FW_CMD_RELEASE_FOCUS) { -+ dev_dbg(&client->dev, "%s: Releasing autofocus\n", -+ __func__); -+ return ov5640_fw_command(sensor, OV5640_FW_CMD_RELEASE_FOCUS); -+ } -+ -+ // Restart zone config -+ ret = ov5640_fw_command(sensor, OV5640_FW_CMD_ZONE_CONFIG); -+ if (ret) -+ return ret; -+ -+ // Set default focus zones -+ ret = ov5640_fw_command(sensor, OV5640_FW_CMD_DEFAULT_ZONES); -+ if (ret) -+ return ret; -+ -+ dev_dbg(&client->dev, "%s: Triggering autofocus\n", -+ __func__); -+ -+ // Start focussing -+ return ov5640_fw_command(sensor, command); -+} -+ - static int ov5640_set_ctrl_gain(struct ov5640_dev *sensor, bool auto_gain) - { - struct ov5640_ctrls *ctrls = &sensor->ctrls; -@@ -2638,6 +2833,32 @@ static int ov5640_set_ctrl_vflip(struct ov5640_dev *sensor, int value) - (BIT(2) | BIT(1)) : 0); - } - -+static int ov5640_get_af_status(struct ov5640_dev *sensor) -+{ -+ u8 fw_status; -+ int ret; -+ -+ ret = ov5640_read_reg(sensor, OV5640_REG_FW_STATUS, &fw_status); -+ if (ret) -+ return ret; -+ -+ switch (fw_status) { -+ case OV5640_FW_STATUS_S_FIRMWARE: -+ case OV5640_FW_STATUS_S_STARTUP: -+ return V4L2_AUTO_FOCUS_STATUS_FAILED; -+ break; -+ case OV5640_FW_STATUS_S_IDLE: -+ return V4L2_AUTO_FOCUS_STATUS_IDLE; -+ break; -+ case OV5640_FW_STATUS_S_FOCUSED: -+ return V4L2_AUTO_FOCUS_STATUS_REACHED; -+ break; -+ default: -+ return V4L2_AUTO_FOCUS_STATUS_BUSY; -+ break; -+ } -+} -+ - static int ov5640_g_volatile_ctrl(struct v4l2_ctrl *ctrl) - { - struct v4l2_subdev *sd = ctrl_to_sd(ctrl); -@@ -2659,6 +2880,12 @@ static int ov5640_g_volatile_ctrl(struct v4l2_ctrl *ctrl) - return val; - sensor->ctrls.exposure->val = val; - break; -+ case V4L2_CID_FOCUS_AUTO: -+ val = ov5640_get_af_status(sensor); -+ if (val < 0) -+ return val; -+ sensor->ctrls.af_status->val = val; -+ break; - } - - return 0; -@@ -2690,6 +2917,18 @@ static int ov5640_s_ctrl(struct v4l2_ctrl *ctrl) - case V4L2_CID_AUTO_WHITE_BALANCE: - ret = ov5640_set_ctrl_white_balance(sensor, ctrl->val); - break; -+ case V4L2_CID_FOCUS_AUTO: -+ if (ctrl->val) -+ ret = ov5640_set_ctrl_focus(sensor, OV5640_FW_CMD_CONTINUOUS_FOCUS); -+ else -+ ret = ov5640_set_ctrl_focus(sensor, OV5640_FW_CMD_RELEASE_FOCUS); -+ break; -+ case V4L2_CID_AUTO_FOCUS_START: -+ ret = ov5640_set_ctrl_focus(sensor, OV5640_FW_CMD_TRIGGER_FOCUS); -+ break; -+ case V4L2_CID_AUTO_FOCUS_STOP: -+ ret = ov5640_set_ctrl_focus(sensor, OV5640_FW_CMD_RELEASE_FOCUS); -+ break; - case V4L2_CID_HUE: - ret = ov5640_set_ctrl_hue(sensor, ctrl->val); - break; -@@ -2762,6 +3001,20 @@ static int ov5640_init_controls(struct ov5640_dev *sensor) - ctrls->gain = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_GAIN, - 0, 1023, 1, 0); - -+ /* Autofocus */ -+ ctrls->focus_auto = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_FOCUS_AUTO, -+ 0, 1, 1, 0); -+ ctrls->af_start = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_AUTO_FOCUS_START, -+ 0, 1, 1, 0); -+ ctrls->af_stop = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_AUTO_FOCUS_STOP, -+ 0, 1, 1, 0); -+ ctrls->af_status = v4l2_ctrl_new_std(hdl, ops, -+ V4L2_CID_AUTO_FOCUS_STATUS, 0, -+ (V4L2_AUTO_FOCUS_STATUS_BUSY | -+ V4L2_AUTO_FOCUS_STATUS_REACHED | -+ V4L2_AUTO_FOCUS_STATUS_FAILED), -+ 0, V4L2_AUTO_FOCUS_STATUS_IDLE); -+ - ctrls->saturation = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_SATURATION, - 0, 255, 1, 64); - ctrls->hue = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_HUE, -@@ -2795,6 +3048,7 @@ static int ov5640_init_controls(struct ov5640_dev *sensor) - v4l2_ctrl_auto_cluster(3, &ctrls->auto_wb, 0, false); - v4l2_ctrl_auto_cluster(2, &ctrls->auto_gain, 0, true); - v4l2_ctrl_auto_cluster(2, &ctrls->auto_exp, 1, true); -+ v4l2_ctrl_cluster(4, &ctrls->focus_auto); - - sensor->sd.ctrl_handler = hdl; - return 0; --- -2.25.4 - diff --git a/sys-kernel/pinephone-sources/files/panic-led.patch b/sys-kernel/pinephone-sources/files/panic-led.patch deleted file mode 100644 index 2bb4843..0000000 --- a/sys-kernel/pinephone-sources/files/panic-led.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -index 1c555456b..05fab5d79 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -@@ -78,6 +78,7 @@ green { - }; - - led-2 { -+ linux,default-trigger = "panic"; - function = LED_FUNCTION_INDICATOR; - color = ; - gpios = <&pio 3 19 GPIO_ACTIVE_HIGH>; /* PD19 */ diff --git a/sys-kernel/pinephone-sources/pinephone-sources-5.16.2.ebuild b/sys-kernel/pinephone-sources/pinephone-sources-5.18.3.ebuild old mode 100644 new mode 100755 similarity index 70% rename from sys-kernel/pinephone-sources/pinephone-sources-5.16.2.ebuild rename to sys-kernel/pinephone-sources/pinephone-sources-5.18.3.ebuild index 7fd6f42..325279b --- a/sys-kernel/pinephone-sources/pinephone-sources-5.16.2.ebuild +++ b/sys-kernel/pinephone-sources/pinephone-sources-5.18.3.ebuild @@ -5,7 +5,7 @@ EAPI="8" ETYPE="sources" K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="3" +K_GENPATCHES_VER="5" inherit kernel-2 detect_version @@ -27,15 +27,6 @@ PATCHES=( ${DISTDIR}/all-${PV}.patch # Drop Megi's Modem-Power "${FILESDIR}"/dts-pinephone-drop-modem-power-node.patch - # Implement Martijn's improvements for the cameras - "${FILESDIR}"/media-ov5640-Implement-autofocus.patch - # Reparent clocks to lower speed-occillator - "${FILESDIR}"/ccu-sun50i-a64-reparent-clocks-to-lower-speed-oscillator.patch - # Quirk for Kernel-Bug 210681 - "${FILESDIR}"/0107-quirk-kernel-org-bug-210681-firmware_rome_error.patch - # LED patches - "${FILESDIR}"/0177-leds-gpio-make-max_brightness-configurable.patch - "${FILESDIR}"/panic-led.patch ) src_prepare() { @@ -53,7 +44,7 @@ pkg_postinst() { einfo "# make INSTALL_DTBS_PATH=/boot/dtbs dtbs_install" einfo "You will need to create and initramfs afterwards." einfo "If you use dracut you can run:" - einfo "# dracut -m \"rootfs-block base\" --host-only --kver 5.16.2-pinehone-gentoo-arm64" + einfo "# dracut -m \"rootfs-block base\" --host-only --kver 5.18.3-pinehone-gentoo-arm64" einfo "Change 5.16.2-pinehone-gentoo-arm64 to your kernel version installed in /lib/modules" }