diff --git a/patch/kernel/meson64-dev/0032-pinctrl-meson-gxl-remove-invalid-GPIOX-tsin_a-pins.patch b/patch/kernel/meson64-dev/0032-pinctrl-meson-gxl-remove-invalid-GPIOX-tsin_a-pins.patch deleted file mode 100644 index d292566729..0000000000 --- a/patch/kernel/meson64-dev/0032-pinctrl-meson-gxl-remove-invalid-GPIOX-tsin_a-pins.patch +++ /dev/null @@ -1,54 +0,0 @@ -From a0b609f0ab7f5f45de63d2cbded7dc67b384fe21 Mon Sep 17 00:00:00 2001 -From: Neil Armstrong -Date: Wed, 7 Nov 2018 11:34:47 +0100 -Subject: [PATCH] pinctrl: meson-gxl: remove invalid GPIOX tsin_a pins - -The GPIOX tsin_a pins wrongly uses the SDCard pinctrl bits, this -patch completely removes these pins entries until we find out what -are the correct bits and registers to be used instead. - -Fixes: 5a6ae9b80139 ("pinctrl: meson-gxl: add tsin_a pins") ---- - drivers/pinctrl/meson/pinctrl-meson-gxl.c | 12 ++---------- - 1 file changed, 2 insertions(+), 10 deletions(-) - -diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c -index 158f618f1695..0c0a5018102b 100644 ---- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c -+++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c -@@ -239,13 +239,9 @@ static const unsigned int eth_link_led_pins[] = { GPIOZ_14 }; - static const unsigned int eth_act_led_pins[] = { GPIOZ_15 }; - - static const unsigned int tsin_a_d0_pins[] = { GPIODV_0 }; --static const unsigned int tsin_a_d0_x_pins[] = { GPIOX_10 }; - static const unsigned int tsin_a_clk_pins[] = { GPIODV_8 }; --static const unsigned int tsin_a_clk_x_pins[] = { GPIOX_11 }; - static const unsigned int tsin_a_sop_pins[] = { GPIODV_9 }; --static const unsigned int tsin_a_sop_x_pins[] = { GPIOX_8 }; - static const unsigned int tsin_a_d_valid_pins[] = { GPIODV_10 }; --static const unsigned int tsin_a_d_valid_x_pins[] = { GPIOX_9 }; - static const unsigned int tsin_a_fail_pins[] = { GPIODV_11 }; - static const unsigned int tsin_a_dp_pins[] = { - GPIODV_1, GPIODV_2, GPIODV_3, GPIODV_4, GPIODV_5, GPIODV_6, GPIODV_7, -@@ -432,10 +428,6 @@ static struct meson_pmx_group meson_gxl_periphs_groups[] = { - GROUP(spi_miso, 5, 2), - GROUP(spi_ss0, 5, 1), - GROUP(spi_sclk, 5, 0), -- GROUP(tsin_a_sop_x, 6, 3), -- GROUP(tsin_a_d_valid_x, 6, 2), -- GROUP(tsin_a_d0_x, 6, 1), -- GROUP(tsin_a_clk_x, 6, 0), - - /* Bank Z */ - GROUP(eth_mdio, 4, 23), -@@ -698,8 +690,8 @@ static const char * const eth_led_groups[] = { - }; - - static const char * const tsin_a_groups[] = { -- "tsin_a_clk", "tsin_a_clk_x", "tsin_a_sop", "tsin_a_sop_x", -- "tsin_a_d_valid", "tsin_a_d_valid_x", "tsin_a_d0", "tsin_a_d0_x", -+ "tsin_a_clk", "tsin_a_sop", -+ "tsin_a_d_valid", "tsin_a_d0", - "tsin_a_dp", "tsin_a_fail", - }; - diff --git a/patch/kernel/meson64-dev/0033-arm64-dts-meson-gx-Add-hdmi_5v-regulator-as-hdmi-tx-.patch b/patch/kernel/meson64-dev/0033-arm64-dts-meson-gx-Add-hdmi_5v-regulator-as-hdmi-tx-.patch deleted file mode 100644 index c80d0fed1b..0000000000 --- a/patch/kernel/meson64-dev/0033-arm64-dts-meson-gx-Add-hdmi_5v-regulator-as-hdmi-tx-.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 81f8f5bcd8af794d9e2822a1c6cb79114b2f6bba Mon Sep 17 00:00:00 2001 -From: Neil Armstrong -Date: Thu, 8 Nov 2018 14:24:38 +0100 -Subject: [PATCH] arm64: dts: meson-gx: Add hdmi_5v regulator as hdmi tx supply - -The hdmi_5v regulator must be enabled to provide power to the physical HDMI -PHY and enables the HDMI 5V presence loopback for the monitor. - -Fixes: b409f625a6d5 ("ARM64: dts: meson-gx: Add HDMI_5V regulator on selected boards") -Signed-off-by: Neil Armstrong ---- - arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 1 + - arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 1 + - arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 1 + - arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts | 1 + - arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 1 + - 5 files changed, 5 insertions(+) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi -index 87ec1c193f12..e91b2968719d 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi -@@ -162,6 +162,7 @@ - status = "okay"; - pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; - pinctrl-names = "default"; -+ hdmi-supply = <&hdmi_5v>; - }; - - &hdmi_tx_tmds_port { -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts -index 6c3137592f10..a0eec9d165dc 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts -@@ -115,6 +115,7 @@ - status = "okay"; - pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; - pinctrl-names = "default"; -+ hdmi-supply = <&hdmi_5v>; - }; - - &hdmi_tx_tmds_port { -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts -index 5416ca69502d..1ceb40404bd3 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts -@@ -192,6 +192,7 @@ - status = "okay"; - pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; - pinctrl-names = "default"; -+ hdmi-supply = <&hdmi_5v>; - }; - - &hdmi_tx_tmds_port { -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts -index ce85c927dc34..1b0ee78d29bd 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts -@@ -88,6 +88,7 @@ - status = "okay"; - pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; - pinctrl-names = "default"; -+ hdmi-supply = <&hdmi_5v>; - }; - - &hdmi_tx_tmds_port { -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts -index f49746c3cc02..1d3a9a0b0147 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts -@@ -308,6 +308,7 @@ - status = "okay"; - pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; - pinctrl-names = "default"; -+ hdmi-supply = <&hdmi_5v>; - }; - - &hdmi_tx_tmds_port { diff --git a/patch/kernel/meson64-dev/0034-arm64-dts-meson-gxl-libretech-cc-fix-GPIO-lines-name.patch b/patch/kernel/meson64-dev/0034-arm64-dts-meson-gxl-libretech-cc-fix-GPIO-lines-name.patch deleted file mode 100644 index 5a53de83ef..0000000000 --- a/patch/kernel/meson64-dev/0034-arm64-dts-meson-gxl-libretech-cc-fix-GPIO-lines-name.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 5957ecfc01ececcb490abf4c7154caaadaf9192c Mon Sep 17 00:00:00 2001 -From: Neil Armstrong -Date: Wed, 7 Nov 2018 11:45:47 +0100 -Subject: [PATCH] arm64: dts: meson-gxl-libretech-cc: fix GPIO lines names - -The gpio line names were set in the pinctrl node instead of the gpio node, -at the time it was merged, it worked, but was obviously wrong. -This patch moves the properties to the gpio nodes. - -Fixes: 47884c5c746e ("ARM64: dts: meson-gxl-libretech-cc: Add GPIO lines names") -Signed-off-by: Neil Armstrong ---- - arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts -index 1ceb40404bd3..f812d3106271 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts -@@ -201,7 +201,7 @@ - }; - }; - --&pinctrl_aobus { -+&gpio_ao { - gpio-line-names = "UART TX", - "UART RX", - "Blue LED", -@@ -216,7 +216,7 @@ - "7J1 Header Pin15"; - }; - --&pinctrl_periphs { -+&gpio { - gpio-line-names = /* Bank GPIOZ */ - "", "", "", "", "", "", "", - "", "", "", "", "", "", "", diff --git a/patch/kernel/meson64-dev/0035-arm64-dts-meson-gxbb-nanopi-k2-fix-GPIO-lines-names.patch b/patch/kernel/meson64-dev/0035-arm64-dts-meson-gxbb-nanopi-k2-fix-GPIO-lines-names.patch deleted file mode 100644 index eb4af35727..0000000000 --- a/patch/kernel/meson64-dev/0035-arm64-dts-meson-gxbb-nanopi-k2-fix-GPIO-lines-names.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 309bd4bfad7c88f74a7c789eb8bcd32ce7f3aad1 Mon Sep 17 00:00:00 2001 -From: Neil Armstrong -Date: Wed, 7 Nov 2018 11:45:48 +0100 -Subject: [PATCH] arm64: dts: meson-gxbb-nanopi-k2: fix GPIO lines names - -The gpio line names were set in the pinctrl node instead of the gpio node, -at the time it was merged, it worked, but was obviously wrong. -This patch moves the properties to the gpio nodes. - -Fixes: 12ada0513d7a ("ARM64: dts: meson-gxbb-nanopi-k2: Add GPIO lines names") -Signed-off-by: Neil Armstrong ---- - arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts -index d72b5378eead..cb1d8930209e 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts -@@ -228,7 +228,7 @@ - pinctrl-names = "default"; - }; - --&pinctrl_aobus { -+&gpio_ao { - gpio-line-names = "UART TX", "UART RX", "Power Control", "Power Key In", - "VCCK En", "CON1 Header Pin31", - "I2S Header Pin6", "IR In", "I2S Header Pin7", -@@ -238,7 +238,7 @@ - ""; - }; - --&pinctrl_periphs { -+&gpio { - gpio-line-names = /* Bank GPIOZ */ - "Eth MDIO", "Eth MDC", "Eth RGMII RX Clk", - "Eth RX DV", "Eth RX D0", "Eth RX D1", "Eth RX D2",