Sunxi 5.19 (#4084)
* sunxi-5.19: EDGE: switch to v5.19.2 * sunxi-5.19: fix megous patches * sunxi-5.19: adapt armbian patches to v5.19.2 * sunxi-5.19: update upstream megous patches
This commit is contained in:
parent
5326e1061f
commit
65804f4f9e
@ -23,7 +23,7 @@ case $BRANCH in
|
||||
|
||||
edge)
|
||||
KERNEL_VERSION_LEVEL=${KERNEL_VERSION_LEVEL:-5.19}
|
||||
KERNELSWITCHOBJ=${KERNELSWITCHOBJ:-'tag=v5.19.1'}
|
||||
KERNELSWITCHOBJ=${KERNELSWITCHOBJ:-'tag=v5.19.2'}
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ case $BRANCH in
|
||||
;;
|
||||
edge)
|
||||
KERNEL_VERSION_LEVEL=${KERNEL_VERSION_LEVEL:-5.19}
|
||||
KERNELSWITCHOBJ=${KERNELSWITCHOBJ:-'tag=v5.19.1'}
|
||||
KERNELSWITCHOBJ=${KERNELSWITCHOBJ:-'tag=v5.19.2'}
|
||||
;;
|
||||
|
||||
esac
|
||||
|
||||
@ -26,8 +26,8 @@ diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c b/drivers/staging/
|
||||
index 44f385be9..f71ce6f87 100644
|
||||
--- a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c
|
||||
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_h265.c
|
||||
@@ -301,6 +301,61 @@ static void cedrus_h265_write_scaling_list(struct cedrus_ctx *ctx,
|
||||
}
|
||||
@@ -329,6 +329,61 @@ static int cedrus_h265_is_low_delay(struct cedrus_run *run)
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static void write_entry_point_list(struct cedrus_ctx *ctx,
|
||||
@ -88,7 +88,7 @@ index 44f385be9..f71ce6f87 100644
|
||||
static void cedrus_h265_setup(struct cedrus_ctx *ctx,
|
||||
struct cedrus_run *run)
|
||||
{
|
||||
@@ -312,6 +367,7 @@ static void cedrus_h265_setup(struct cedrus_ctx *ctx,
|
||||
@@ -340,6 +395,7 @@ static void cedrus_h265_setup(struct cedrus_ctx *ctx,
|
||||
const struct v4l2_hevc_pred_weight_table *pred_weight_table;
|
||||
unsigned int width_in_ctb_luma, ctb_size_luma;
|
||||
unsigned int log2_max_luma_coding_block_size;
|
||||
@ -96,7 +96,7 @@ index 44f385be9..f71ce6f87 100644
|
||||
dma_addr_t src_buf_addr;
|
||||
dma_addr_t src_buf_end_addr;
|
||||
u32 chroma_log2_weight_denom;
|
||||
@@ -391,12 +447,19 @@ static void cedrus_h265_setup(struct cedrus_ctx *ctx,
|
||||
@@ -419,12 +475,19 @@ static void cedrus_h265_setup(struct cedrus_ctx *ctx,
|
||||
cedrus_write(dev, VE_DEC_H265_BITS_END_ADDR, reg);
|
||||
|
||||
/* Coding tree block address */
|
||||
@ -120,7 +120,7 @@ index 44f385be9..f71ce6f87 100644
|
||||
|
||||
/* Clear the number of correctly-decoded coding tree blocks. */
|
||||
if (ctx->fh.m2m_ctx->new_frame)
|
||||
@@ -500,7 +563,9 @@ static void cedrus_h265_setup(struct cedrus_ctx *ctx,
|
||||
@@ -528,7 +591,9 @@ static void cedrus_h265_setup(struct cedrus_ctx *ctx,
|
||||
V4L2_HEVC_PPS_FLAG_ENTROPY_CODING_SYNC_ENABLED,
|
||||
pps->flags);
|
||||
|
||||
@ -131,7 +131,7 @@ index 44f385be9..f71ce6f87 100644
|
||||
|
||||
reg |= VE_DEC_H265_FLAG(VE_DEC_H265_DEC_PPS_CTRL1_FLAG_TRANSQUANT_BYPASS_ENABLED,
|
||||
V4L2_HEVC_PPS_FLAG_TRANSQUANT_BYPASS_ENABLED,
|
||||
@@ -576,12 +641,14 @@ static void cedrus_h265_setup(struct cedrus_ctx *ctx,
|
||||
@@ -606,12 +671,14 @@ static void cedrus_h265_setup(struct cedrus_ctx *ctx,
|
||||
|
||||
chroma_log2_weight_denom = pred_weight_table->luma_log2_weight_denom +
|
||||
pred_weight_table->delta_chroma_log2_weight_denom;
|
||||
@ -147,7 +147,7 @@ index 44f385be9..f71ce6f87 100644
|
||||
/* Decoded picture size. */
|
||||
|
||||
reg = VE_DEC_H265_DEC_PIC_SIZE_WIDTH(ctx->src_fmt.width) |
|
||||
@@ -676,6 +743,17 @@ static int cedrus_h265_start(struct cedrus_ctx *ctx)
|
||||
@@ -706,6 +773,17 @@ static int cedrus_h265_start(struct cedrus_ctx *ctx)
|
||||
if (!ctx->codec.h265.neighbor_info_buf)
|
||||
return -ENOMEM;
|
||||
|
||||
@ -165,7 +165,7 @@ index 44f385be9..f71ce6f87 100644
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -696,6 +774,9 @@ static void cedrus_h265_stop(struct cedrus_ctx *ctx)
|
||||
@@ -726,6 +804,9 @@ static void cedrus_h265_stop(struct cedrus_ctx *ctx)
|
||||
ctx->codec.h265.neighbor_info_buf,
|
||||
ctx->codec.h265.neighbor_info_buf_addr,
|
||||
DMA_ATTR_NO_KERNEL_MAPPING);
|
||||
|
||||
@ -0,0 +1,85 @@
|
||||
From 24facdda8477ebff25601c7360c75acc1e672a3e Mon Sep 17 00:00:00 2001
|
||||
From: Ondrej Jirman <megi@xff.cz>
|
||||
Date: Thu, 18 Aug 2022 02:24:08 +0200
|
||||
Subject: [PATCH 426/426] 8723cs: Adapt to API changes in stable (5.19.2) and
|
||||
6.0
|
||||
|
||||
---
|
||||
.../rtl8723cs/os_dep/linux/ioctl_cfg80211.c | 26 +++----------------
|
||||
1 file changed, 4 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/drivers/staging/rtl8723cs/os_dep/linux/ioctl_cfg80211.c b/drivers/staging/rtl8723cs/os_dep/linux/ioctl_cfg80211.c
|
||||
index ca999734af96..e84386a81bce 100644
|
||||
--- a/drivers/staging/rtl8723cs/os_dep/linux/ioctl_cfg80211.c
|
||||
+++ b/drivers/staging/rtl8723cs/os_dep/linux/ioctl_cfg80211.c
|
||||
@@ -445,40 +445,21 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset,
|
||||
struct wiphy *wiphy = adapter_to_wiphy(adapter);
|
||||
u8 ret = _SUCCESS;
|
||||
|
||||
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
|
||||
struct cfg80211_chan_def chdef;
|
||||
|
||||
ret = rtw_chbw_to_cfg80211_chan_def(wiphy, &chdef, ch, bw, offset, ht);
|
||||
if (ret != _SUCCESS)
|
||||
goto exit;
|
||||
|
||||
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0))
|
||||
if (started) {
|
||||
cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, false);
|
||||
goto exit;
|
||||
}
|
||||
-#endif
|
||||
-
|
||||
- if (!rtw_cfg80211_allow_ch_switch_notify(adapter))
|
||||
- goto exit;
|
||||
-
|
||||
- cfg80211_ch_switch_notify(adapter->pnetdev, &chdef);
|
||||
-
|
||||
-#else
|
||||
- int freq = rtw_ch2freq(ch);
|
||||
- enum nl80211_channel_type ctype;
|
||||
|
||||
if (!rtw_cfg80211_allow_ch_switch_notify(adapter))
|
||||
goto exit;
|
||||
|
||||
- if (!freq) {
|
||||
- ret = _FAIL;
|
||||
- goto exit;
|
||||
- }
|
||||
-
|
||||
- ctype = rtw_chbw_to_nl80211_channel_type(ch, bw, offset, ht);
|
||||
- cfg80211_ch_switch_notify(adapter->pnetdev, freq, ctype);
|
||||
-#endif
|
||||
+ cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0);
|
||||
|
||||
exit:
|
||||
return ret;
|
||||
@@ -5348,7 +5329,7 @@ static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *nd
|
||||
return ret;
|
||||
}
|
||||
|
||||
-static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
|
||||
+static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev, unsigned int link_id)
|
||||
{
|
||||
_adapter *adapter = (_adapter *)rtw_netdev_priv(ndev);
|
||||
|
||||
@@ -6725,6 +6706,7 @@ static int cfg80211_rtw_del_virtual_intf(struct wiphy *wiphy,
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
|
||||
static int cfg80211_rtw_get_channel(struct wiphy *wiphy,
|
||||
struct wireless_dev *wdev,
|
||||
+ unsigned int link_id,
|
||||
struct cfg80211_chan_def *chandef)
|
||||
{
|
||||
_adapter *padapter = wiphy_to_adapter(wiphy);
|
||||
@@ -10652,7 +10634,7 @@ void rtw_wdev_unregister(struct wireless_dev *wdev)
|
||||
rtw_cfg80211_indicate_scan_done(adapter, _TRUE);
|
||||
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)) || defined(COMPAT_KERNEL_RELEASE)
|
||||
- if (wdev->current_bss) {
|
||||
+ if (wdev->connected) {
|
||||
RTW_INFO(FUNC_ADPT_FMT" clear current_bss by cfg80211_disconnected\n", FUNC_ADPT_ARG(adapter));
|
||||
rtw_cfg80211_indicate_disconnect(adapter, 0, 1);
|
||||
}
|
||||
--
|
||||
2.35.3
|
||||
|
||||
@ -0,0 +1,471 @@
|
||||
From fea67738bcd794da18aded57302beab798079ae1 Mon Sep 17 00:00:00 2001
|
||||
From: Ondrej Jirman <megi@xff.cz>
|
||||
Date: Wed, 17 Aug 2022 20:32:44 +0200
|
||||
Subject: [PATCH 425/426] Update defconfigs
|
||||
|
||||
---
|
||||
arch/arm/configs/orangepi_defconfig | 6 +--
|
||||
.../configs/pocketbook_touch_lux_3_defconfig | 6 +--
|
||||
arch/arm/configs/tbs_a711_defconfig | 5 +--
|
||||
arch/arm64/configs/orangepi_defconfig | 9 +----
|
||||
arch/arm64/configs/pinebook_pro_defconfig | 40 +++++++++++++------
|
||||
arch/arm64/configs/pinephone_defconfig | 7 +---
|
||||
.../configs/pinephone_multidist_defconfig | 9 +----
|
||||
arch/arm64/configs/pinephone_pro_defconfig | 17 +++-----
|
||||
8 files changed, 40 insertions(+), 59 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/configs/orangepi_defconfig b/arch/arm/configs/orangepi_defconfig
|
||||
index f3b0ab5807f1..9c533f53feea 100644
|
||||
--- a/arch/arm/configs/orangepi_defconfig
|
||||
+++ b/arch/arm/configs/orangepi_defconfig
|
||||
@@ -87,10 +87,6 @@ CONFIG_IOSCHED_BFQ=y
|
||||
CONFIG_BFQ_GROUP_IOSCHED=y
|
||||
CONFIG_CMA=y
|
||||
CONFIG_CMA_DEBUGFS=y
|
||||
-CONFIG_ZPOOL=y
|
||||
-CONFIG_ZBUD=y
|
||||
-CONFIG_Z3FOLD=y
|
||||
-CONFIG_ZSMALLOC=y
|
||||
CONFIG_NET=y
|
||||
CONFIG_PACKET=y
|
||||
CONFIG_PACKET_DIAG=y
|
||||
@@ -364,6 +360,7 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
|
||||
CONFIG_SERIAL_DEV_BUS=y
|
||||
CONFIG_HW_RANDOM=y
|
||||
# CONFIG_HW_RANDOM_IPROC_RNG200 is not set
|
||||
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
CONFIG_I2C_MUX=y
|
||||
CONFIG_I2C_BCM2835=y
|
||||
@@ -704,7 +701,6 @@ CONFIG_DETECT_HUNG_TASK=y
|
||||
CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
|
||||
CONFIG_WQ_WATCHDOG=y
|
||||
# CONFIG_SCHED_DEBUG is not set
|
||||
-CONFIG_STACKTRACE=y
|
||||
# CONFIG_RCU_TRACE is not set
|
||||
# CONFIG_FTRACE is not set
|
||||
# CONFIG_RUNTIME_TESTING_MENU is not set
|
||||
diff --git a/arch/arm/configs/pocketbook_touch_lux_3_defconfig b/arch/arm/configs/pocketbook_touch_lux_3_defconfig
|
||||
index c1e683f27fd9..72300a2e6c89 100644
|
||||
--- a/arch/arm/configs/pocketbook_touch_lux_3_defconfig
|
||||
+++ b/arch/arm/configs/pocketbook_touch_lux_3_defconfig
|
||||
@@ -85,10 +85,6 @@ CONFIG_IOSCHED_BFQ=y
|
||||
CONFIG_BFQ_GROUP_IOSCHED=y
|
||||
CONFIG_CMA=y
|
||||
CONFIG_CMA_DEBUGFS=y
|
||||
-CONFIG_ZPOOL=y
|
||||
-CONFIG_ZBUD=y
|
||||
-CONFIG_Z3FOLD=y
|
||||
-CONFIG_ZSMALLOC=y
|
||||
CONFIG_NET=y
|
||||
CONFIG_PACKET=y
|
||||
CONFIG_PACKET_DIAG=y
|
||||
@@ -237,6 +233,7 @@ CONFIG_SERIAL_8250_DW=y
|
||||
CONFIG_SERIAL_OF_PLATFORM=y
|
||||
CONFIG_SERIAL_DEV_BUS=y
|
||||
# CONFIG_HW_RANDOM is not set
|
||||
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
CONFIG_I2C_MUX=y
|
||||
CONFIG_I2C_GPIO=y
|
||||
@@ -423,5 +420,4 @@ CONFIG_CMA_SIZE_MBYTES=128
|
||||
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=15
|
||||
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=7
|
||||
CONFIG_DEBUG_FS=y
|
||||
-CONFIG_STACKTRACE=y
|
||||
# CONFIG_RUNTIME_TESTING_MENU is not set
|
||||
diff --git a/arch/arm/configs/tbs_a711_defconfig b/arch/arm/configs/tbs_a711_defconfig
|
||||
index 2466706f252e..dc9a37732312 100644
|
||||
--- a/arch/arm/configs/tbs_a711_defconfig
|
||||
+++ b/arch/arm/configs/tbs_a711_defconfig
|
||||
@@ -83,10 +83,6 @@ CONFIG_BLK_CGROUP_IOLATENCY=y
|
||||
CONFIG_IOSCHED_BFQ=y
|
||||
CONFIG_CMA=y
|
||||
CONFIG_CMA_DEBUGFS=y
|
||||
-CONFIG_ZPOOL=y
|
||||
-CONFIG_ZBUD=y
|
||||
-CONFIG_Z3FOLD=y
|
||||
-CONFIG_ZSMALLOC=y
|
||||
CONFIG_NET=y
|
||||
CONFIG_PACKET=y
|
||||
CONFIG_PACKET_DIAG=y
|
||||
@@ -272,6 +268,7 @@ CONFIG_SERIAL_8250_DW=y
|
||||
CONFIG_SERIAL_OF_PLATFORM=y
|
||||
CONFIG_SERIAL_DEV_BUS=y
|
||||
# CONFIG_HW_RANDOM is not set
|
||||
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
CONFIG_I2C_MUX=y
|
||||
CONFIG_I2C_GPIO=y
|
||||
diff --git a/arch/arm64/configs/orangepi_defconfig b/arch/arm64/configs/orangepi_defconfig
|
||||
index 932bfe12b70e..64b0dcfa1a08 100644
|
||||
--- a/arch/arm64/configs/orangepi_defconfig
|
||||
+++ b/arch/arm64/configs/orangepi_defconfig
|
||||
@@ -95,10 +95,6 @@ CONFIG_BLK_CGROUP_IOCOST=y
|
||||
CONFIG_IOSCHED_BFQ=y
|
||||
CONFIG_BFQ_GROUP_IOSCHED=y
|
||||
CONFIG_CMA=y
|
||||
-CONFIG_ZPOOL=y
|
||||
-CONFIG_ZBUD=y
|
||||
-CONFIG_Z3FOLD=y
|
||||
-CONFIG_ZSMALLOC=y
|
||||
CONFIG_NET=y
|
||||
CONFIG_PACKET=y
|
||||
CONFIG_PACKET_DIAG=y
|
||||
@@ -361,6 +357,8 @@ CONFIG_SERIAL_8250_DW=y
|
||||
CONFIG_SERIAL_OF_PLATFORM=y
|
||||
CONFIG_SERIAL_DEV_BUS=y
|
||||
# CONFIG_HW_RANDOM is not set
|
||||
+# CONFIG_RANDOM_TRUST_CPU is not set
|
||||
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
CONFIG_I2C_MV64XXX=y
|
||||
CONFIG_SPI=y
|
||||
@@ -631,10 +629,8 @@ CONFIG_CRYPTO_ECHAINIV=y
|
||||
CONFIG_CRYPTO_BLAKE2B=y
|
||||
CONFIG_CRYPTO_BLAKE2S=y
|
||||
CONFIG_CRYPTO_MD4=y
|
||||
-CONFIG_CRYPTO_SM3=y
|
||||
CONFIG_CRYPTO_ARC4=y
|
||||
CONFIG_CRYPTO_DES=y
|
||||
-CONFIG_CRYPTO_SM4=y
|
||||
CONFIG_CRYPTO_DEFLATE=y
|
||||
CONFIG_CRYPTO_LZO=y
|
||||
CONFIG_CRYPTO_LZ4=y
|
||||
@@ -655,7 +651,6 @@ CONFIG_DEBUG_FS=y
|
||||
CONFIG_DETECT_HUNG_TASK=y
|
||||
CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
|
||||
CONFIG_WQ_WATCHDOG=y
|
||||
-CONFIG_STACKTRACE=y
|
||||
# CONFIG_RCU_TRACE is not set
|
||||
# CONFIG_FTRACE is not set
|
||||
# CONFIG_STRICT_DEVMEM is not set
|
||||
diff --git a/arch/arm64/configs/pinebook_pro_defconfig b/arch/arm64/configs/pinebook_pro_defconfig
|
||||
index 69b2f421177a..ae13afbbb492 100644
|
||||
--- a/arch/arm64/configs/pinebook_pro_defconfig
|
||||
+++ b/arch/arm64/configs/pinebook_pro_defconfig
|
||||
@@ -1,5 +1,7 @@
|
||||
CONFIG_SYSVIPC=y
|
||||
CONFIG_POSIX_MQUEUE=y
|
||||
+CONFIG_WATCH_QUEUE=y
|
||||
+CONFIG_GENERIC_IRQ_DEBUGFS=y
|
||||
CONFIG_NO_HZ=y
|
||||
CONFIG_HIGH_RES_TIMERS=y
|
||||
CONFIG_BPF_SYSCALL=y
|
||||
@@ -15,16 +17,17 @@ CONFIG_TASK_IO_ACCOUNTING=y
|
||||
CONFIG_PSI=y
|
||||
CONFIG_IKCONFIG=y
|
||||
CONFIG_IKCONFIG_PROC=y
|
||||
-CONFIG_CGROUPS=y
|
||||
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=14
|
||||
CONFIG_MEMCG=y
|
||||
CONFIG_BLK_CGROUP=y
|
||||
-CONFIG_CGROUP_SCHED=y
|
||||
CONFIG_CGROUP_PIDS=y
|
||||
CONFIG_CPUSETS=y
|
||||
# CONFIG_PROC_PID_CPUSET is not set
|
||||
CONFIG_CGROUP_DEVICE=y
|
||||
CONFIG_CGROUP_BPF=y
|
||||
CONFIG_USER_NS=y
|
||||
+CONFIG_SCHED_AUTOGROUP=y
|
||||
+CONFIG_RELAY=y
|
||||
# CONFIG_RD_BZIP2 is not set
|
||||
# CONFIG_RD_LZMA is not set
|
||||
# CONFIG_RD_XZ is not set
|
||||
@@ -44,6 +47,8 @@ CONFIG_ARCH_ROCKCHIP=y
|
||||
# CONFIG_ARM64_ERRATUM_1508412 is not set
|
||||
# CONFIG_ARM64_ERRATUM_2051678 is not set
|
||||
# CONFIG_ARM64_ERRATUM_2077057 is not set
|
||||
+# CONFIG_ARM64_ERRATUM_2054223 is not set
|
||||
+# CONFIG_ARM64_ERRATUM_2067961 is not set
|
||||
# CONFIG_CAVIUM_ERRATUM_22375 is not set
|
||||
# CONFIG_CAVIUM_ERRATUM_23144 is not set
|
||||
# CONFIG_CAVIUM_ERRATUM_23154 is not set
|
||||
@@ -60,6 +65,7 @@ CONFIG_ARCH_ROCKCHIP=y
|
||||
# CONFIG_SOCIONEXT_SYNQUACER_PREITS is not set
|
||||
CONFIG_ARM64_VA_BITS_48=y
|
||||
CONFIG_SCHED_MC=y
|
||||
+CONFIG_SCHED_CLUSTER=y
|
||||
CONFIG_NR_CPUS=8
|
||||
CONFIG_NUMA=y
|
||||
CONFIG_NODES_SHIFT=2
|
||||
@@ -71,6 +77,8 @@ CONFIG_ARM64_PMEM=y
|
||||
# CONFIG_ARM64_BTI is not set
|
||||
# CONFIG_ARM64_E0PD is not set
|
||||
# CONFIG_ARCH_RANDOM is not set
|
||||
+# CONFIG_ARM64_MTE is not set
|
||||
+# CONFIG_ARM64_EPAN is not set
|
||||
# CONFIG_ARM64_SVE is not set
|
||||
# CONFIG_EFI is not set
|
||||
CONFIG_HIBERNATION=y
|
||||
@@ -124,13 +132,12 @@ CONFIG_BLK_INLINE_ENCRYPTION=y
|
||||
CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
|
||||
CONFIG_PARTITION_ADVANCED=y
|
||||
# CONFIG_MQ_IOSCHED_KYBER is not set
|
||||
+CONFIG_BINFMT_MISC=y
|
||||
CONFIG_TRANSPARENT_HUGEPAGE=y
|
||||
CONFIG_CMA=y
|
||||
+CONFIG_CMA_DEBUGFS=y
|
||||
+CONFIG_CMA_SYSFS=y
|
||||
CONFIG_CMA_AREAS=7
|
||||
-CONFIG_ZPOOL=y
|
||||
-CONFIG_ZBUD=y
|
||||
-CONFIG_Z3FOLD=y
|
||||
-CONFIG_ZSMALLOC=y
|
||||
CONFIG_NET=y
|
||||
CONFIG_PACKET=y
|
||||
CONFIG_PACKET_DIAG=y
|
||||
@@ -149,6 +156,7 @@ CONFIG_INET_UDP_DIAG=y
|
||||
CONFIG_INET_RAW_DIAG=y
|
||||
CONFIG_IPV6_ROUTER_PREF=y
|
||||
CONFIG_IPV6_ROUTE_INFO=y
|
||||
+CONFIG_IPV6_OPTIMISTIC_DAD=y
|
||||
CONFIG_IPV6_MIP6=y
|
||||
# CONFIG_IPV6_SIT is not set
|
||||
CONFIG_NETFILTER=y
|
||||
@@ -275,6 +283,7 @@ CONFIG_CFG80211_DEBUGFS=y
|
||||
CONFIG_CFG80211_WEXT=y
|
||||
CONFIG_MAC80211=y
|
||||
CONFIG_MAC80211_LEDS=y
|
||||
+CONFIG_MAC80211_DEBUGFS=y
|
||||
CONFIG_RFKILL=y
|
||||
CONFIG_RFKILL_GPIO=y
|
||||
CONFIG_PCI=y
|
||||
@@ -455,6 +464,7 @@ CONFIG_SERIAL_8250_DW=y
|
||||
CONFIG_SERIAL_OF_PLATFORM=y
|
||||
CONFIG_SERIAL_DEV_BUS=y
|
||||
# CONFIG_HW_RANDOM is not set
|
||||
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
CONFIG_I2C_MUX=y
|
||||
CONFIG_I2C_GPIO=y
|
||||
@@ -695,6 +705,8 @@ CONFIG_EXT4_FS=y
|
||||
CONFIG_EXT4_FS_POSIX_ACL=y
|
||||
CONFIG_XFS_FS=y
|
||||
CONFIG_XFS_POSIX_ACL=y
|
||||
+CONFIG_BTRFS_FS=y
|
||||
+CONFIG_BTRFS_FS_POSIX_ACL=y
|
||||
CONFIG_F2FS_FS=y
|
||||
CONFIG_F2FS_FS_SECURITY=y
|
||||
CONFIG_F2FS_CHECK_FS=y
|
||||
@@ -707,14 +719,18 @@ CONFIG_FUSE_FS=y
|
||||
CONFIG_CUSE=y
|
||||
CONFIG_OVERLAY_FS=y
|
||||
CONFIG_OVERLAY_FS_INDEX=y
|
||||
+CONFIG_OVERLAY_FS_XINO_AUTO=y
|
||||
CONFIG_OVERLAY_FS_METACOPY=y
|
||||
CONFIG_VFAT_FS=y
|
||||
+CONFIG_FAT_DEFAULT_UTF8=y
|
||||
+CONFIG_EXFAT_FS=y
|
||||
CONFIG_NTFS3_FS=y
|
||||
CONFIG_NTFS3_64BIT_CLUSTER=y
|
||||
CONFIG_NTFS3_FS_POSIX_ACL=y
|
||||
CONFIG_PROC_CHILDREN=y
|
||||
CONFIG_TMPFS=y
|
||||
CONFIG_TMPFS_POSIX_ACL=y
|
||||
+CONFIG_TMPFS_INODE64=y
|
||||
CONFIG_ECRYPT_FS=y
|
||||
CONFIG_ECRYPT_FS_MESSAGING=y
|
||||
CONFIG_SQUASHFS=y
|
||||
@@ -726,12 +742,15 @@ CONFIG_SQUASHFS_LZO=y
|
||||
CONFIG_SQUASHFS_XZ=y
|
||||
CONFIG_SQUASHFS_ZSTD=y
|
||||
CONFIG_NFS_FS=y
|
||||
-CONFIG_NFS_V3_ACL=y
|
||||
+# CONFIG_NFS_V2 is not set
|
||||
+# CONFIG_NFS_V3 is not set
|
||||
CONFIG_NFS_V4=y
|
||||
+CONFIG_NFS_V4_1=y
|
||||
+CONFIG_NFS_V4_2=y
|
||||
+CONFIG_NFS_V4_2_READ_PLUS=y
|
||||
CONFIG_NFSD=y
|
||||
CONFIG_NFSD_V3_ACL=y
|
||||
CONFIG_NFSD_V4=y
|
||||
-CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
|
||||
CONFIG_CIFS=y
|
||||
CONFIG_CIFS_XATTR=y
|
||||
CONFIG_CIFS_POSIX=y
|
||||
@@ -758,13 +777,9 @@ CONFIG_CRYPTO_CURVE25519=y
|
||||
CONFIG_CRYPTO_CHACHA20POLY1305=y
|
||||
CONFIG_CRYPTO_SEQIV=y
|
||||
CONFIG_CRYPTO_ECHAINIV=y
|
||||
-CONFIG_CRYPTO_BLAKE2B=y
|
||||
CONFIG_CRYPTO_BLAKE2S=y
|
||||
CONFIG_CRYPTO_MD4=y
|
||||
-CONFIG_CRYPTO_SM3=y
|
||||
CONFIG_CRYPTO_ARC4=y
|
||||
-CONFIG_CRYPTO_DES=y
|
||||
-CONFIG_CRYPTO_SM4=y
|
||||
CONFIG_CRYPTO_DEFLATE=y
|
||||
CONFIG_CRYPTO_LZO=y
|
||||
CONFIG_CRYPTO_LZ4=y
|
||||
@@ -788,7 +803,6 @@ CONFIG_DETECT_HUNG_TASK=y
|
||||
CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
|
||||
CONFIG_WQ_WATCHDOG=y
|
||||
# CONFIG_SCHED_DEBUG is not set
|
||||
-CONFIG_STACKTRACE=y
|
||||
# CONFIG_RCU_TRACE is not set
|
||||
# CONFIG_FTRACE is not set
|
||||
# CONFIG_STRICT_DEVMEM is not set
|
||||
diff --git a/arch/arm64/configs/pinephone_defconfig b/arch/arm64/configs/pinephone_defconfig
|
||||
index 5b0a10d69b30..027d62023612 100644
|
||||
--- a/arch/arm64/configs/pinephone_defconfig
|
||||
+++ b/arch/arm64/configs/pinephone_defconfig
|
||||
@@ -121,10 +121,6 @@ CONFIG_IOSCHED_BFQ=y
|
||||
CONFIG_BFQ_GROUP_IOSCHED=y
|
||||
CONFIG_CMA=y
|
||||
CONFIG_CMA_DEBUGFS=y
|
||||
-CONFIG_ZPOOL=y
|
||||
-CONFIG_ZBUD=y
|
||||
-CONFIG_Z3FOLD=y
|
||||
-CONFIG_ZSMALLOC=y
|
||||
CONFIG_NET=y
|
||||
CONFIG_PACKET=y
|
||||
CONFIG_PACKET_DIAG=y
|
||||
@@ -326,6 +322,7 @@ CONFIG_SERIAL_8250_DW=y
|
||||
CONFIG_SERIAL_OF_PLATFORM=y
|
||||
CONFIG_SERIAL_DEV_BUS=y
|
||||
# CONFIG_HW_RANDOM is not set
|
||||
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
CONFIG_I2C_MUX=y
|
||||
CONFIG_I2C_GPIO=y
|
||||
@@ -636,10 +633,8 @@ CONFIG_CRYPTO_BLAKE2S=m
|
||||
CONFIG_CRYPTO_MD4=m
|
||||
CONFIG_CRYPTO_SHA1=y
|
||||
CONFIG_CRYPTO_SHA3=y
|
||||
-CONFIG_CRYPTO_SM3=y
|
||||
CONFIG_CRYPTO_ARC4=m
|
||||
CONFIG_CRYPTO_DES=y
|
||||
-CONFIG_CRYPTO_SM4=y
|
||||
CONFIG_CRYPTO_DEFLATE=y
|
||||
CONFIG_CRYPTO_LZO=y
|
||||
CONFIG_CRYPTO_LZ4=y
|
||||
diff --git a/arch/arm64/configs/pinephone_multidist_defconfig b/arch/arm64/configs/pinephone_multidist_defconfig
|
||||
index df9f57177176..30a4e01c1cc9 100644
|
||||
--- a/arch/arm64/configs/pinephone_multidist_defconfig
|
||||
+++ b/arch/arm64/configs/pinephone_multidist_defconfig
|
||||
@@ -35,7 +35,6 @@ CONFIG_SCHED_AUTOGROUP=y
|
||||
# CONFIG_RD_ZSTD is not set
|
||||
CONFIG_EXPERT=y
|
||||
CONFIG_PERF_EVENTS=y
|
||||
-# CONFIG_SLUB_DEBUG is not set
|
||||
CONFIG_ARCH_SUNXI=y
|
||||
# CONFIG_ARM64_ERRATUM_832075 is not set
|
||||
# CONFIG_ARM64_ERRATUM_1024718 is not set
|
||||
@@ -118,10 +117,6 @@ CONFIG_IOSCHED_BFQ=y
|
||||
CONFIG_BFQ_GROUP_IOSCHED=y
|
||||
CONFIG_CMA=y
|
||||
CONFIG_CMA_DEBUGFS=y
|
||||
-CONFIG_ZPOOL=y
|
||||
-CONFIG_ZBUD=y
|
||||
-CONFIG_Z3FOLD=y
|
||||
-CONFIG_ZSMALLOC=y
|
||||
CONFIG_NET=y
|
||||
CONFIG_PACKET=y
|
||||
CONFIG_PACKET_DIAG=y
|
||||
@@ -322,6 +317,7 @@ CONFIG_SERIAL_8250_DW=y
|
||||
CONFIG_SERIAL_OF_PLATFORM=y
|
||||
CONFIG_SERIAL_DEV_BUS=y
|
||||
# CONFIG_HW_RANDOM is not set
|
||||
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
CONFIG_I2C_GPIO=y
|
||||
CONFIG_I2C_MV64XXX=y
|
||||
@@ -590,9 +586,7 @@ CONFIG_CRYPTO_SEQIV=y
|
||||
CONFIG_CRYPTO_ECHAINIV=y
|
||||
CONFIG_CRYPTO_BLAKE2S=y
|
||||
CONFIG_CRYPTO_MD4=y
|
||||
-CONFIG_CRYPTO_SM3=y
|
||||
CONFIG_CRYPTO_ARC4=y
|
||||
-CONFIG_CRYPTO_SM4=y
|
||||
CONFIG_CRYPTO_DEFLATE=y
|
||||
CONFIG_CRYPTO_LZO=y
|
||||
CONFIG_CRYPTO_LZ4=y
|
||||
@@ -613,6 +607,7 @@ CONFIG_DYNAMIC_DEBUG=y
|
||||
CONFIG_FRAME_WARN=1024
|
||||
CONFIG_MAGIC_SYSRQ=y
|
||||
CONFIG_DEBUG_FS=y
|
||||
+# CONFIG_SLUB_DEBUG is not set
|
||||
CONFIG_BOOTTIME_TRACING=y
|
||||
CONFIG_FUNCTION_TRACER=y
|
||||
CONFIG_FTRACE_SYSCALLS=y
|
||||
diff --git a/arch/arm64/configs/pinephone_pro_defconfig b/arch/arm64/configs/pinephone_pro_defconfig
|
||||
index 4cb7efe1e3c2..66bc250b41ec 100644
|
||||
--- a/arch/arm64/configs/pinephone_pro_defconfig
|
||||
+++ b/arch/arm64/configs/pinephone_pro_defconfig
|
||||
@@ -1,10 +1,13 @@
|
||||
CONFIG_SYSVIPC=y
|
||||
CONFIG_POSIX_MQUEUE=y
|
||||
+CONFIG_WATCH_QUEUE=y
|
||||
+CONFIG_GENERIC_IRQ_DEBUGFS=y
|
||||
CONFIG_NO_HZ=y
|
||||
CONFIG_HIGH_RES_TIMERS=y
|
||||
CONFIG_BPF_SYSCALL=y
|
||||
CONFIG_BPF_JIT=y
|
||||
# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set
|
||||
+CONFIG_PREEMPT_VOLUNTARY=y
|
||||
CONFIG_BSD_PROCESS_ACCT=y
|
||||
CONFIG_BSD_PROCESS_ACCT_V3=y
|
||||
CONFIG_TASKSTATS=y
|
||||
@@ -124,10 +127,6 @@ CONFIG_TRANSPARENT_HUGEPAGE=y
|
||||
CONFIG_CMA=y
|
||||
CONFIG_CMA_DEBUGFS=y
|
||||
CONFIG_CMA_SYSFS=y
|
||||
-CONFIG_ZPOOL=y
|
||||
-CONFIG_ZBUD=y
|
||||
-CONFIG_Z3FOLD=y
|
||||
-CONFIG_ZSMALLOC=y
|
||||
CONFIG_NET=y
|
||||
CONFIG_PACKET=y
|
||||
CONFIG_PACKET_DIAG=y
|
||||
@@ -373,7 +372,6 @@ CONFIG_USB_NET_CDC_MBIM=y
|
||||
# CONFIG_USB_NET_NET1080 is not set
|
||||
# CONFIG_USB_NET_CDC_SUBSET is not set
|
||||
# CONFIG_USB_NET_ZAURUS is not set
|
||||
-CONFIG_USB_RTL8153_ECM=y
|
||||
# CONFIG_WLAN_VENDOR_ADMTEK is not set
|
||||
# CONFIG_WLAN_VENDOR_ATH is not set
|
||||
# CONFIG_WLAN_VENDOR_ATMEL is not set
|
||||
@@ -421,15 +419,14 @@ CONFIG_SERIAL_AMBA_PL011=y
|
||||
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
|
||||
CONFIG_SERIAL_DEV_BUS=y
|
||||
# CONFIG_HW_RANDOM is not set
|
||||
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
-CONFIG_I2C_MUX_PINCTRL=y
|
||||
-CONFIG_I2C_DEMUX_PINCTRL=y
|
||||
CONFIG_I2C_GPIO=y
|
||||
CONFIG_I2C_RK3X=y
|
||||
CONFIG_SPI=y
|
||||
CONFIG_SPI_ROCKCHIP=y
|
||||
# CONFIG_PTP_1588_CLOCK is not set
|
||||
-CONFIG_PINCTRL_RK805=y
|
||||
+CONFIG_SYSCON_REBOOT_MODE=y
|
||||
CONFIG_IP5XXX_POWER=y
|
||||
CONFIG_CHARGER_GPIO=y
|
||||
CONFIG_CHARGER_RK818=y
|
||||
@@ -571,7 +568,6 @@ CONFIG_USB_CONFIGFS_F_MIDI=y
|
||||
CONFIG_USB_CONFIGFS_F_HID=y
|
||||
CONFIG_USB_CONFIGFS_F_UVC=y
|
||||
CONFIG_USB_CONFIGFS_F_PRINTER=y
|
||||
-CONFIG_USB_CDC_COMPOSITE=y
|
||||
CONFIG_TYPEC=y
|
||||
CONFIG_TYPEC_TCPM=y
|
||||
CONFIG_TYPEC_TCPCI=y
|
||||
@@ -709,12 +705,9 @@ CONFIG_CRYPTO_CHACHA20POLY1305=y
|
||||
CONFIG_CRYPTO_SEQIV=y
|
||||
CONFIG_CRYPTO_ECHAINIV=y
|
||||
CONFIG_CRYPTO_BLAKE2B=y
|
||||
-CONFIG_CRYPTO_BLAKE2S=y
|
||||
CONFIG_CRYPTO_MD4=y
|
||||
-CONFIG_CRYPTO_SM3=y
|
||||
CONFIG_CRYPTO_ARC4=y
|
||||
CONFIG_CRYPTO_DES=y
|
||||
-CONFIG_CRYPTO_SM4=y
|
||||
CONFIG_CRYPTO_DEFLATE=y
|
||||
CONFIG_CRYPTO_LZO=y
|
||||
CONFIG_CRYPTO_LZ4=y
|
||||
--
|
||||
2.35.3
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
From 1b377c6a007b9a531ad6a812cd892e22e1078d69 Mon Sep 17 00:00:00 2001
|
||||
From: Ondrej Jirman <megi@xff.cz>
|
||||
Date: Wed, 17 Aug 2022 20:24:59 +0200
|
||||
Subject: [PATCH 424/426] arm64: dts: rockchip: rk3399: Add reboot mode driver
|
||||
|
||||
U-Boot uses value 0xef08a53c to jump back to USB loader maskrom
|
||||
mode instead of normal boot. Add support for reboot to maskrom
|
||||
from the kernel.
|
||||
|
||||
Signed-off-by: Ondrej Jirman <megi@xff.cz>
|
||||
---
|
||||
arch/arm64/boot/dts/rockchip/rk3399.dtsi | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
||||
index f37da179d403..f064431876fc 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
||||
@@ -1193,6 +1193,13 @@ pmu_io_domains: io-domains {
|
||||
compatible = "rockchip,rk3399-pmu-io-voltage-domain";
|
||||
status = "disabled";
|
||||
};
|
||||
+
|
||||
+ reboot-mode {
|
||||
+ compatible = "syscon-reboot-mode";
|
||||
+ offset = <0x300>;
|
||||
+ mode-normal = <0>;
|
||||
+ mode-maskrom = <0xef08a53c>;
|
||||
+ };
|
||||
};
|
||||
|
||||
spi3: spi@ff350000 {
|
||||
--
|
||||
2.35.3
|
||||
|
||||
@ -41,7 +41,7 @@ index 5b4c02786..94b872ef1 100644
|
||||
if (ret < 0 || !rx_buf)
|
||||
goto out;
|
||||
|
||||
@@ -867,8 +868,13 @@ static void scpi_free_channels(void *data)
|
||||
@@ -866,8 +867,13 @@ static void scpi_free_channels(void *data)
|
||||
struct scpi_drvinfo *info = data;
|
||||
int i;
|
||||
|
||||
@ -58,13 +58,13 @@ index 5b4c02786..94b872ef1 100644
|
||||
|
||||
static int scpi_remove(struct platform_device *pdev)
|
||||
@@ -924,6 +930,7 @@ static int scpi_probe(struct platform_device *pdev)
|
||||
struct resource res;
|
||||
struct device *dev = &pdev->dev;
|
||||
struct device_node *np = dev->of_node;
|
||||
struct scpi_drvinfo *scpi_drvinfo;
|
||||
+ bool use_mbox_names = false;
|
||||
|
||||
scpi_info = devm_kzalloc(dev, sizeof(*scpi_info), GFP_KERNEL);
|
||||
if (!scpi_info)
|
||||
scpi_drvinfo = devm_kzalloc(dev, sizeof(*scpi_drvinfo), GFP_KERNEL);
|
||||
if (!scpi_drvinfo)
|
||||
@@ -937,6 +944,14 @@ static int scpi_probe(struct platform_device *pdev)
|
||||
dev_err(dev, "no mboxes property in '%pOF'\n", np);
|
||||
return -ENODEV;
|
||||
@ -78,8 +78,8 @@ index 5b4c02786..94b872ef1 100644
|
||||
+ count /= 2;
|
||||
+ }
|
||||
|
||||
scpi_info->channels = devm_kcalloc(dev, count, sizeof(struct scpi_chan),
|
||||
GFP_KERNEL);
|
||||
scpi_drvinfo->channels =
|
||||
devm_kcalloc(dev, count, sizeof(struct scpi_chan), GFP_KERNEL);
|
||||
@@ -985,15 +1000,34 @@ static int scpi_probe(struct platform_device *pdev)
|
||||
mutex_init(&pchan->xfers_lock);
|
||||
|
||||
|
||||
@ -52,18 +52,19 @@ index c5b987c44..ca6a34099 100644
|
||||
dwc3_writel(dwc->regs, DWC3_GCTL, reg);
|
||||
|
||||
dwc->current_dr_role = mode;
|
||||
@@ -152,6 +152,7 @@ static void __dwc3_set_mode(struct work_struct *work)
|
||||
@@ -151,7 +151,7 @@ static void __dwc3_set_mode(struct work_struct *work)
|
||||
case DWC3_GCTL_PRTCAP_HOST:
|
||||
dwc3_host_exit(dwc);
|
||||
break;
|
||||
case DWC3_GCTL_PRTCAP_DEVICE:
|
||||
- case DWC3_GCTL_PRTCAP_DEVICE:
|
||||
+ case DWC3_GCTL_PRTCAP_DEVICE_DISCONNECTED:
|
||||
dwc3_gadget_exit(dwc);
|
||||
dwc3_event_buffers_cleanup(dwc);
|
||||
break;
|
||||
@@ -168,10 +169,37 @@ static void __dwc3_set_mode(struct work_struct *work)
|
||||
|
||||
/* For DRD host or device mode only */
|
||||
if (desired_dr_role != DWC3_GCTL_PRTCAP_OTG) {
|
||||
@@ -173,10 +173,37 @@ static void __dwc3_set_mode(struct work_struct *work)
|
||||
if (dwc->current_dr_role && ((DWC3_IP_IS(DWC3) ||
|
||||
DWC3_VER_IS_PRIOR(DWC31, 190A)) &&
|
||||
desired_dr_role != DWC3_GCTL_PRTCAP_OTG)) {
|
||||
+ /*
|
||||
+ * RK3399 TypeC PHY needs to be powered off and powered on again
|
||||
+ * for it to apply the correct Type-C plug orientation setting
|
||||
@ -98,15 +99,16 @@ index c5b987c44..ca6a34099 100644
|
||||
/*
|
||||
* Wait for internal clocks to synchronized. DWC_usb31 and
|
||||
* DWC_usb32 may need at least 50ms (less for DWC_usb3). To
|
||||
@@ -209,6 +237,7 @@ static void __dwc3_set_mode(struct work_struct *work)
|
||||
@@ -213,7 +240,7 @@ static void __dwc3_set_mode(struct work_struct *work)
|
||||
}
|
||||
}
|
||||
break;
|
||||
case DWC3_GCTL_PRTCAP_DEVICE:
|
||||
- case DWC3_GCTL_PRTCAP_DEVICE:
|
||||
+ case DWC3_GCTL_PRTCAP_DEVICE_DISCONNECTED:
|
||||
dwc3_core_soft_reset(dwc);
|
||||
|
||||
dwc3_event_buffers_setup(dwc);
|
||||
@@ -1515,6 +1544,8 @@ static void dwc3_get_properties(struct dwc3 *dwc)
|
||||
@@ -1520,6 +1547,8 @@ static void dwc3_get_properties(struct dwc3 *dwc)
|
||||
|
||||
dwc->dis_split_quirk = device_property_read_bool(dev,
|
||||
"snps,dis-split-quirk");
|
||||
@ -115,18 +117,20 @@ index c5b987c44..ca6a34099 100644
|
||||
|
||||
dwc->lpm_nyet_threshold = lpm_nyet_threshold;
|
||||
dwc->tx_de_emphasis = tx_de_emphasis;
|
||||
@@ -1947,6 +1978,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
|
||||
@@ -1951,7 +1980,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
|
||||
u32 reg;
|
||||
|
||||
switch (dwc->current_dr_role) {
|
||||
case DWC3_GCTL_PRTCAP_DEVICE:
|
||||
- case DWC3_GCTL_PRTCAP_DEVICE:
|
||||
+ case DWC3_GCTL_PRTCAP_DEVICE_DISCONNECTED:
|
||||
if (pm_runtime_suspended(dwc->dev))
|
||||
break;
|
||||
spin_lock_irqsave(&dwc->lock, flags);
|
||||
@@ -2007,11 +2039,12 @@ static int dwc3_resume_common(struct dwc3 *dwc, pm_message_t msg)
|
||||
@@ -2011,12 +2040,12 @@ static int dwc3_resume_common(struct dwc3 *dwc, pm_message_t msg)
|
||||
u32 reg;
|
||||
|
||||
switch (dwc->current_dr_role) {
|
||||
case DWC3_GCTL_PRTCAP_DEVICE:
|
||||
- case DWC3_GCTL_PRTCAP_DEVICE:
|
||||
+ case DWC3_GCTL_PRTCAP_DEVICE_DISCONNECTED:
|
||||
ret = dwc3_core_init_for_resume(dwc);
|
||||
if (ret)
|
||||
@ -137,26 +141,29 @@ index c5b987c44..ca6a34099 100644
|
||||
spin_lock_irqsave(&dwc->lock, flags);
|
||||
dwc3_gadget_resume(dwc);
|
||||
spin_unlock_irqrestore(&dwc->lock, flags);
|
||||
@@ -2070,6 +2103,7 @@ static int dwc3_runtime_checks(struct dwc3 *dwc)
|
||||
@@ -2074,7 +2103,7 @@ static int dwc3_resume_common(struct dwc3 *dwc, pm_message_t msg)
|
||||
static int dwc3_runtime_checks(struct dwc3 *dwc)
|
||||
{
|
||||
switch (dwc->current_dr_role) {
|
||||
case DWC3_GCTL_PRTCAP_DEVICE:
|
||||
- case DWC3_GCTL_PRTCAP_DEVICE:
|
||||
+ case DWC3_GCTL_PRTCAP_DEVICE_DISCONNECTED:
|
||||
if (dwc->connected)
|
||||
return -EBUSY;
|
||||
break;
|
||||
@@ -2112,6 +2146,7 @@ static int dwc3_runtime_resume(struct device *dev)
|
||||
@@ -2116,7 +2145,7 @@ static int dwc3_runtime_resume(struct device *dev)
|
||||
return ret;
|
||||
|
||||
switch (dwc->current_dr_role) {
|
||||
case DWC3_GCTL_PRTCAP_DEVICE:
|
||||
- case DWC3_GCTL_PRTCAP_DEVICE:
|
||||
+ case DWC3_GCTL_PRTCAP_DEVICE_DISCONNECTED:
|
||||
dwc3_gadget_process_pending_events(dwc);
|
||||
break;
|
||||
case DWC3_GCTL_PRTCAP_HOST:
|
||||
@@ -2131,6 +2166,7 @@ static int dwc3_runtime_idle(struct device *dev)
|
||||
@@ -2135,7 +2164,7 @@ static int dwc3_runtime_idle(struct device *dev)
|
||||
struct dwc3 *dwc = dev_get_drvdata(dev);
|
||||
|
||||
switch (dwc->current_dr_role) {
|
||||
case DWC3_GCTL_PRTCAP_DEVICE:
|
||||
- case DWC3_GCTL_PRTCAP_DEVICE:
|
||||
+ case DWC3_GCTL_PRTCAP_DEVICE_DISCONNECTED:
|
||||
if (dwc3_runtime_checks(dwc))
|
||||
return -EBUSY;
|
||||
|
||||
@ -55,16 +55,16 @@ index d1fd31da8..c5b987c44 100644
|
||||
goto out;
|
||||
|
||||
switch (dwc->current_dr_role) {
|
||||
@@ -159,7 +167,7 @@ static void __dwc3_set_mode(struct work_struct *work)
|
||||
}
|
||||
|
||||
/* For DRD host or device mode only */
|
||||
- if (dwc->desired_dr_role != DWC3_GCTL_PRTCAP_OTG) {
|
||||
+ if (desired_dr_role != DWC3_GCTL_PRTCAP_OTG) {
|
||||
@@ -164,7 +172,7 @@ static void __dwc3_set_mode(struct work_struct *work)
|
||||
*/
|
||||
if (dwc->current_dr_role && ((DWC3_IP_IS(DWC3) ||
|
||||
DWC3_VER_IS_PRIOR(DWC31, 190A)) &&
|
||||
- dwc->desired_dr_role != DWC3_GCTL_PRTCAP_OTG)) {
|
||||
+ desired_dr_role != DWC3_GCTL_PRTCAP_OTG)) {
|
||||
reg = dwc3_readl(dwc->regs, DWC3_GCTL);
|
||||
reg |= DWC3_GCTL_CORESOFTRESET;
|
||||
dwc3_writel(dwc->regs, DWC3_GCTL, reg);
|
||||
@@ -179,11 +187,11 @@ static void __dwc3_set_mode(struct work_struct *work)
|
||||
@@ -184,11 +192,11 @@ static void __dwc3_set_mode(struct work_struct *work)
|
||||
|
||||
spin_lock_irqsave(&dwc->lock, flags);
|
||||
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
patches.megous/ARM-dts-sun8i-a83t-tbs-a711-Add-regulators-to-the-accelerometer.patch
|
||||
patches.megous/firmware-scpi-Add-support-for-sending-a-SCPI_CMD_SET_SYS_PWR_ST.patch
|
||||
patches.megous/ARM-dts-sun8i-a83t-tbs-a711-Add-camera-sensors-HM5065-GC2145.patch
|
||||
patches.megous/firmware-scpi-Don-t-probe-SCP-during-SCPI-driver-probe.patch
|
||||
- patches.megous/firmware-scpi-Don-t-probe-SCP-during-SCPI-driver-probe.patch
|
||||
patches.megous/ARM-dts-sun8i-a83t-tbs-a711-Add-flash-led-support.patch
|
||||
patches.megous/media-sun6i-csi-Add-support-for-RGB565-and-RGB555.patch
|
||||
patches.megous/media-sun6i-csi-Pass-on-g_parm-s_parm-to-the-subdev.patch
|
||||
@ -411,7 +411,7 @@
|
||||
patches.megous/wifi-rtw89-fix-long-RX-latency-in-low-power-mode.patch
|
||||
patches.megous/wifi-rtw89-pci-fix-PCI-doesn-t-reclaim-TX-BD-properly.patch
|
||||
patches.megous/wifi-rtw89-disable-invalid-phy-reports-for-all-ICs.patch
|
||||
patches.megous/wifi-rtw89-8852a-rfk-fix-div-0-exception.patch
|
||||
- patches.megous/wifi-rtw89-8852a-rfk-fix-div-0-exception.patch
|
||||
patches.megous/ieee80211-add-trigger-frame-definition.patch
|
||||
patches.megous/dt-bindings-vendor-prefix-add-prefix-for-Voltafield.patch
|
||||
patches.megous/dt-bindings-iio-magnetometer-add-DT-binding-for-Voltafield-AF81.patch
|
||||
@ -424,6 +424,10 @@
|
||||
patches.megous/usb-typec-tcpm-Unregister-altmodes-before-registering-new-ones.patch
|
||||
patches.megous/ASoC-rockchip-Fix-doubling-of-playback-speed-after-system-sleep.patch
|
||||
# tag orange-pi-5.19-20220815-0310
|
||||
patches.megous/arm64-dts-rockchip-rk3399-Add-reboot-mode-driver.patch
|
||||
patches.megous/Update-defconfigs.patch
|
||||
patches.megous/8723cs-Adapt-to-API-changes-in-stable-5.19.2-and-6.0.patch
|
||||
# tag orange-pi-5.19-20220818-0237
|
||||
|
||||
#
|
||||
# Automatically generated by the script mk_format_patch
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
patches.megous/ARM-dts-sun8i-a83t-tbs-a711-Add-regulators-to-the-accelerometer.patch
|
||||
patches.megous/firmware-scpi-Add-support-for-sending-a-SCPI_CMD_SET_SYS_PWR_ST.patch
|
||||
patches.megous/ARM-dts-sun8i-a83t-tbs-a711-Add-camera-sensors-HM5065-GC2145.patch
|
||||
patches.megous/firmware-scpi-Don-t-probe-SCP-during-SCPI-driver-probe.patch
|
||||
- patches.megous/firmware-scpi-Don-t-probe-SCP-during-SCPI-driver-probe.patch
|
||||
patches.megous/ARM-dts-sun8i-a83t-tbs-a711-Add-flash-led-support.patch
|
||||
patches.megous/media-sun6i-csi-Add-support-for-RGB565-and-RGB555.patch
|
||||
patches.megous/media-sun6i-csi-Pass-on-g_parm-s_parm-to-the-subdev.patch
|
||||
@ -411,7 +411,7 @@
|
||||
patches.megous/wifi-rtw89-fix-long-RX-latency-in-low-power-mode.patch
|
||||
patches.megous/wifi-rtw89-pci-fix-PCI-doesn-t-reclaim-TX-BD-properly.patch
|
||||
patches.megous/wifi-rtw89-disable-invalid-phy-reports-for-all-ICs.patch
|
||||
patches.megous/wifi-rtw89-8852a-rfk-fix-div-0-exception.patch
|
||||
- patches.megous/wifi-rtw89-8852a-rfk-fix-div-0-exception.patch
|
||||
patches.megous/ieee80211-add-trigger-frame-definition.patch
|
||||
patches.megous/dt-bindings-vendor-prefix-add-prefix-for-Voltafield.patch
|
||||
patches.megous/dt-bindings-iio-magnetometer-add-DT-binding-for-Voltafield-AF81.patch
|
||||
@ -424,3 +424,7 @@
|
||||
patches.megous/usb-typec-tcpm-Unregister-altmodes-before-registering-new-ones.patch
|
||||
patches.megous/ASoC-rockchip-Fix-doubling-of-playback-speed-after-system-sleep.patch
|
||||
# tag orange-pi-5.19-20220815-0310
|
||||
patches.megous/arm64-dts-rockchip-rk3399-Add-reboot-mode-driver.patch
|
||||
patches.megous/Update-defconfigs.patch
|
||||
patches.megous/8723cs-Adapt-to-API-changes-in-stable-5.19.2-and-6.0.patch
|
||||
# tag orange-pi-5.19-20220818-0237
|
||||
|
||||
Loading…
Reference in New Issue
Block a user