diff --git a/patch/kernel/sunxi-dev/0100-drm-sun4i-Add-support-for-HDMI-voltage-regulator.patch b/patch/kernel/sunxi-dev/0100-drm-sun4i-Add-support-for-HDMI-voltage-regulator.patch deleted file mode 100644 index d5a343bb1e..0000000000 --- a/patch/kernel/sunxi-dev/0100-drm-sun4i-Add-support-for-HDMI-voltage-regulator.patch +++ /dev/null @@ -1,87 +0,0 @@ -From f50ad947fd638dc7dde8afb54db743dfc5db6177 Mon Sep 17 00:00:00 2001 -From: Jernej Skrabec -Date: Tue, 4 Sep 2018 12:40:52 +0800 -Subject: [PATCH 100/146] drm/sun4i: Add support for HDMI voltage regulator - -Some boards have HDMI VCC pin connected to voltage regulator which may -not be turned on by default. - -Add support for such boards by adding voltage regulator handling code to -HDMI driver. - -Signed-off-by: Jernej Skrabec -[Icenowy: change supply name to "hvcc"] -Signed-off-by: Icenowy Zheng ---- - drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 17 ++++++++++++++++- - drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 2 ++ - 2 files changed, 18 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c -index 31875b636434..ed2983770e9c 100644 ---- a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c -+++ b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c -@@ -125,10 +125,22 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master, - return PTR_ERR(hdmi->clk_tmds); - } - -+ hdmi->regulator = devm_regulator_get(dev, "hvcc"); -+ if (IS_ERR(hdmi->regulator)) { -+ dev_err(dev, "Couldn't get regulator\n"); -+ return PTR_ERR(hdmi->regulator); -+ } -+ -+ ret = regulator_enable(hdmi->regulator); -+ if (ret) { -+ dev_err(dev, "Failed to enable regulator\n"); -+ return ret; -+ } -+ - ret = reset_control_deassert(hdmi->rst_ctrl); - if (ret) { - dev_err(dev, "Could not deassert ctrl reset control\n"); -- return ret; -+ goto err_disable_regulator; - } - - ret = clk_prepare_enable(hdmi->clk_tmds); -@@ -183,6 +195,8 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master, - clk_disable_unprepare(hdmi->clk_tmds); - err_assert_ctrl_reset: - reset_control_assert(hdmi->rst_ctrl); -+err_disable_regulator: -+ regulator_disable(hdmi->regulator); - - return ret; - } -@@ -196,6 +210,7 @@ static void sun8i_dw_hdmi_unbind(struct device *dev, struct device *master, - sun8i_hdmi_phy_remove(hdmi); - clk_disable_unprepare(hdmi->clk_tmds); - reset_control_assert(hdmi->rst_ctrl); -+ regulator_disable(hdmi->regulator); - } - - static const struct component_ops sun8i_dw_hdmi_ops = { -diff --git a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h -index aadbe0a10b0c..7fdc1ecd2892 100644 ---- a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h -+++ b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - #include - - #define SUN8I_HDMI_PHY_DBG_CTRL_REG 0x0000 -@@ -176,6 +177,7 @@ struct sun8i_dw_hdmi { - struct drm_encoder encoder; - struct sun8i_hdmi_phy *phy; - struct dw_hdmi_plat_data plat_data; -+ struct regulator *regulator; - struct reset_control *rst_ctrl; - }; - --- -2.17.1 - diff --git a/patch/kernel/sunxi-dev/board-a64-v3-14-19-arm64-dts-allwinner-a64-Olinuxino-add-Ethernet-nodes.patch b/patch/kernel/sunxi-dev/board-a64-v3-14-19-arm64-dts-allwinner-a64-Olinuxino-add-Ethernet-nodes.patch deleted file mode 100644 index 44923ac648..0000000000 --- a/patch/kernel/sunxi-dev/board-a64-v3-14-19-arm64-dts-allwinner-a64-Olinuxino-add-Ethernet-nodes.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts -index b3f186434f36..26075b9a76e3 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts -@@ -51,6 +51,7 @@ - compatible = "olimex,a64-olinuxino", "allwinner,sun50i-a64"; - - aliases { -+ ethernet0 = &emac; - serial0 = &uart0; - }; - -@@ -64,6 +65,22 @@ - }; - }; - -+&emac { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&rgmii_pins>; -+ phy-mode = "rgmii"; -+ phy-handle = <&ext_rgmii_phy>; -+ phy-supply = <®_dcdc1>; -+ status = "okay"; -+}; -+ -+&mdio { -+ ext_rgmii_phy: ethernet-phy@1 { -+ compatible = "ethernet-phy-ieee802.3-c22"; -+ reg = <1>; -+ }; -+}; -+ - &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; diff --git a/patch/kernel/sunxi-dev/board-a83t-v7-1-4-ARM-dts-sun8i-a83t-Add-the-cir-pin-for-the-A83T.patch b/patch/kernel/sunxi-dev/board-a83t-v7-1-4-ARM-dts-sun8i-a83t-Add-the-cir-pin-for-the-A83T.patch deleted file mode 100644 index 3377ef7aa8..0000000000 --- a/patch/kernel/sunxi-dev/board-a83t-v7-1-4-ARM-dts-sun8i-a83t-Add-the-cir-pin-for-the-A83T.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/arch/arm/boot/dts/sun8i-a83t.dtsi b/arch/arm/boot/dts/sun8i-a83t.dtsi -index 2be23d600957..afed6c0dea6f 100644 ---- a/arch/arm/boot/dts/sun8i-a83t.dtsi -+++ b/arch/arm/boot/dts/sun8i-a83t.dtsi -@@ -1004,6 +1004,11 @@ - interrupt-controller; - #interrupt-cells = <3>; - -+ r_cir_pin: r-cir-pin { -+ pins = "PL12"; -+ function = "s_cir_rx"; -+ }; -+ - r_rsb_pins: r-rsb-pins { - pins = "PL0", "PL1"; - function = "s_rsb";