From 3cafdc99bb3eadca6b6f0f937df1975e5ab47285 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 23 Apr 2022 13:35:43 +0000 Subject: [PATCH] linux (Allwinner): update patches for 5.18-rc3 --- .../linux/0030-wip-H6-deinterlace.patch | 24 ++++++++++--------- ...dd-parenthesis-around-macro-argument.patch | 4 ++-- ...-Rename-PHY-regulator-variable-to-re.patch | 5 +--- ...-Add-support-for-enabling-a-regulato.patch | 4 ++-- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/projects/Allwinner/patches/linux/0030-wip-H6-deinterlace.patch b/projects/Allwinner/patches/linux/0030-wip-H6-deinterlace.patch index 7c5eec8a1c..c8ea769b3e 100644 --- a/projects/Allwinner/patches/linux/0030-wip-H6-deinterlace.patch +++ b/projects/Allwinner/patches/linux/0030-wip-H6-deinterlace.patch @@ -5,7 +5,7 @@ Subject: [PATCH 40/44] wip: H6 deinterlace Signed-off-by: Jernej Skrabec --- - drivers/media/platform/Kconfig | 13 + + .../media/platform/sunxi/sunxi50i-di/Kconfig | 13 + drivers/media/platform/sunxi/Makefile | 1 + .../media/platform/sunxi/sun50i-di/Makefile | 2 + .../platform/sunxi/sun50i-di/sun50i-di.c | 1134 +++++++++++++++++ @@ -15,12 +15,10 @@ Signed-off-by: Jernej Skrabec create mode 100644 drivers/media/platform/sunxi/sun50i-di/sun50i-di.c create mode 100644 drivers/media/platform/sunxi/sun50i-di/sun50i-di.h ---- a/drivers/media/platform/Kconfig -+++ b/drivers/media/platform/Kconfig -@@ -574,6 +574,19 @@ config VIDEO_QCOM_VENUS - on various Qualcomm SoCs. - To compile this driver as a module choose m here. - +--- /dev/null ++++ b/drivers/media/platform/sunxi/sun50i-di/Kconfig +@@ -0,0 +1,13 @@ ++# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_SUN50I_DEINTERLACE + tristate "Allwinner Deinterlace v2 driver" + depends on VIDEO_DEV && VIDEO_V4L2 @@ -33,10 +31,6 @@ Signed-off-by: Jernej Skrabec + Support for the Allwinner deinterlace v2 unit found on + some SoCs, like H6. + To compile this driver as a module choose m here. -+ - config VIDEO_SUN8I_DEINTERLACE - tristate "Allwinner Deinterlace driver" - depends on VIDEO_DEV && VIDEO_V4L2 --- a/drivers/media/platform/sunxi/Makefile +++ b/drivers/media/platform/sunxi/Makefile @@ -3,4 +3,5 @@ @@ -1362,3 +1356,11 @@ Signed-off-by: Jernej Skrabec +}; + +#endif +--- a/drivers/media/platform/sunxi/Kconfig 2022-04-17 20:57:31.000000000 +0000 ++++ b/drivers/media/platform/sunxi/Kconfig 2022-04-23 13:22:19.652398021 +0000 +@@ -5,4 +5,5 @@ + source "drivers/media/platform/sunxi/sun4i-csi/Kconfig" + source "drivers/media/platform/sunxi/sun6i-csi/Kconfig" + source "drivers/media/platform/sunxi/sun8i-di/Kconfig" ++source "drivers/media/platform/sunxi/sun50i-di/Kconfig" + source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig" diff --git a/projects/Allwinner/patches/linux/0032-ASoC-sun4i-i2s-Add-parenthesis-around-macro-argument.patch b/projects/Allwinner/patches/linux/0032-ASoC-sun4i-i2s-Add-parenthesis-around-macro-argument.patch index 8aa7fb3a2e..1d50f97a4d 100644 --- a/projects/Allwinner/patches/linux/0032-ASoC-sun4i-i2s-Add-parenthesis-around-macro-argument.patch +++ b/projects/Allwinner/patches/linux/0032-ASoC-sun4i-i2s-Add-parenthesis-around-macro-argument.patch @@ -18,10 +18,10 @@ Signed-off-by: Jernej Skrabec @@ -116,16 +116,16 @@ #define SUN8I_I2S_CHAN_CFG_REG 0x30 - #define SUN8I_I2S_CHAN_CFG_RX_SLOT_NUM_MASK GENMASK(6, 4) + #define SUN8I_I2S_CHAN_CFG_RX_SLOT_NUM_MASK GENMASK(7, 4) -#define SUN8I_I2S_CHAN_CFG_RX_SLOT_NUM(chan) ((chan - 1) << 4) +#define SUN8I_I2S_CHAN_CFG_RX_SLOT_NUM(chan) (((chan) - 1) << 4) - #define SUN8I_I2S_CHAN_CFG_TX_SLOT_NUM_MASK GENMASK(2, 0) + #define SUN8I_I2S_CHAN_CFG_TX_SLOT_NUM_MASK GENMASK(3, 0) -#define SUN8I_I2S_CHAN_CFG_TX_SLOT_NUM(chan) (chan - 1) +#define SUN8I_I2S_CHAN_CFG_TX_SLOT_NUM(chan) ((chan) - 1) diff --git a/projects/Allwinner/patches/linux/0045-net-stmmac-sun8i-Rename-PHY-regulator-variable-to-re.patch b/projects/Allwinner/patches/linux/0045-net-stmmac-sun8i-Rename-PHY-regulator-variable-to-re.patch index 2d84ecb115..1f613cf062 100644 --- a/projects/Allwinner/patches/linux/0045-net-stmmac-sun8i-Rename-PHY-regulator-variable-to-re.patch +++ b/projects/Allwinner/patches/linux/0045-net-stmmac-sun8i-Rename-PHY-regulator-variable-to-re.patch @@ -14,11 +14,10 @@ Signed-off-by: Ondrej Jirman --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c -@@ -57,20 +57,22 @@ struct emac_variant { +@@ -57,18 +57,20 @@ struct emac_variant { }; /* struct sunxi_priv_data - hold all sunxi private data -- * @tx_clk: reference to MAC TX clock - * @ephy_clk: reference to the optional EPHY clock for the internal PHY - * @regulator: reference to the optional regulator - * @rst_ephy: reference to the optional EPHY reset for the internal PHY @@ -27,7 +26,6 @@ Signed-off-by: Ondrej Jirman - * @internal_phy_powered: Does the internal PHY is enabled - * @use_internal_phy: Is the internal PHY selected for use - * @mux_handle: Internal pointer used by mdio-mux lib -+ * @tx_clk: reference to MAC TX clock + * @ephy_clk: reference to the optional EPHY clock for + * the internal PHY + * @regulator_phy: reference to the optional regulator @@ -40,7 +38,6 @@ Signed-off-by: Ondrej Jirman + * @mux_handle: Internal pointer used by mdio-mux lib */ struct sunxi_priv_data { - struct clk *tx_clk; struct clk *ephy_clk; - struct regulator *regulator; + struct regulator *regulator_phy; diff --git a/projects/Allwinner/patches/linux/0046-net-stmmac-sun8i-Add-support-for-enabling-a-regulato.patch b/projects/Allwinner/patches/linux/0046-net-stmmac-sun8i-Add-support-for-enabling-a-regulato.patch index adc32db17e..2b6ea97b09 100644 --- a/projects/Allwinner/patches/linux/0046-net-stmmac-sun8i-Add-support-for-enabling-a-regulato.patch +++ b/projects/Allwinner/patches/linux/0046-net-stmmac-sun8i-Add-support-for-enabling-a-regulato.patch @@ -26,8 +26,8 @@ Signed-off-by: Ondrej Jirman * @rst_ephy: reference to the optional EPHY reset for * the internal PHY * @variant: reference to the current board variant -@@ -73,6 +75,7 @@ struct sunxi_priv_data { - struct clk *tx_clk; +@@ -73,6 +75,7 @@ + struct sunxi_priv_data { struct clk *ephy_clk; struct regulator *regulator_phy; + struct regulator *regulator_phy_io;