From 684abc3cdf56aa3a15cf387bb0174e4ef4bd1cc5 Mon Sep 17 00:00:00 2001 From: Martin Ayotte Date: Wed, 9 Jan 2019 11:41:56 -0500 Subject: [PATCH] delete some useless patches --- .../fix-A64-mmc2-remove-PC1-pin.patch | 13 -- ...x-0001-network-audio-orangepiwin-dts.patch | 181 ------------------ .../sunxi-dev/xxx-a64-olinuxino-eth.patch | 33 ---- 3 files changed, 227 deletions(-) delete mode 100644 patch/kernel/sunxi-dev/fix-A64-mmc2-remove-PC1-pin.patch delete mode 100644 patch/kernel/sunxi-dev/xxx-0001-network-audio-orangepiwin-dts.patch delete mode 100644 patch/kernel/sunxi-dev/xxx-a64-olinuxino-eth.patch diff --git a/patch/kernel/sunxi-dev/fix-A64-mmc2-remove-PC1-pin.patch b/patch/kernel/sunxi-dev/fix-A64-mmc2-remove-PC1-pin.patch deleted file mode 100644 index 5e28d360fa..0000000000 --- a/patch/kernel/sunxi-dev/fix-A64-mmc2-remove-PC1-pin.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi -index 1b2ef28..405e996 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi -@@ -356,7 +366,7 @@ - }; - - mmc2_pins: mmc2-pins { -- pins = "PC1", "PC5", "PC6", "PC8", "PC9", -+ pins = "PC5", "PC6", "PC8", "PC9", - "PC10","PC11", "PC12", "PC13", - "PC14", "PC15", "PC16"; - function = "mmc2"; diff --git a/patch/kernel/sunxi-dev/xxx-0001-network-audio-orangepiwin-dts.patch b/patch/kernel/sunxi-dev/xxx-0001-network-audio-orangepiwin-dts.patch deleted file mode 100644 index 4442abd06d..0000000000 --- a/patch/kernel/sunxi-dev/xxx-0001-network-audio-orangepiwin-dts.patch +++ /dev/null @@ -1,181 +0,0 @@ -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts -index eefe0a458..b5cb62beb 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts -@@ -52,6 +52,7 @@ - compatible = "xunlong,orangepi-win", "allwinner,sun50i-a64"; - - aliases { -+ ethernet0 = &emac; - serial0 = &uart0; - }; - -@@ -59,6 +60,43 @@ - stdout-path = "serial0:115200n8"; - }; - -+ leds { -+ compatible = "gpio-leds"; -+ -+ status { -+ label = "orangepi:green:status"; -+ gpios = <&pio 7 11 GPIO_ACTIVE_HIGH>; /* PH11 */ -+ }; -+ }; -+ -+ reg_gmac_3v3: gmac-3v3 { -+ compatible = "regulator-fixed"; -+ regulator-name = "gmac-3v3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ startup-delay-us = <100000>; -+ regulator-boot-on; -+ enable-active-high; -+ gpio = <&pio 3 14 GPIO_ACTIVE_HIGH>; /* PD14 */ -+ status = "okay"; -+ }; -+ -+ reg_usb1_vbus: usb1-vbus { -+ compatible = "regulator-fixed"; -+ regulator-name = "usb1-vbus"; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ regulator-boot-on; -+ enable-active-high; -+ gpio = <&pio 3 7 GPIO_ACTIVE_HIGH>; /* PD7 */ -+ status = "okay"; -+ }; -+ -+ wifi_pwrseq: wifi_pwrseq { -+ compatible = "mmc-pwrseq-simple"; -+ reset-gpios = <&r_pio 0 8 GPIO_ACTIVE_LOW>; /* PL8 */ -+ }; -+ - hdmi-connector { - compatible = "hdmi-connector"; - type = "a"; -@@ -72,10 +109,26 @@ - - }; - -+&codec { -+ status = "okay"; -+}; -+ -+&codec_analog { -+ status = "okay"; -+}; -+ -+&dai { -+ status = "okay"; -+}; -+ - &de { - status = "okay"; - }; - -+&cpu0 { -+ cpu-supply = <®_dcdc2>; -+}; -+ - &ehci1 { - status = "okay"; - }; -@@ -91,14 +144,51 @@ - }; - }; - -+&i2s2 { -+ status = "okay"; -+}; -+ -+&mixer0 { -+ status = "okay"; -+}; -+ -+&emac { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&rgmii_pins>; -+ phy-mode = "rgmii"; -+ phy-handle = <&ext_rgmii_phy>; -+ phy-supply = <®_gmac_3v3>; -+ 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>; - vmmc-supply = <®_dcdc1>; -- cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; -+ cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ -+ disable-wp; -+ bus-width = <4>; - status = "okay"; - }; - -+&mmc1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&mmc1_pins>; -+ vmmc-supply = <®_dldo2>; -+ vqmmc-supply = <®_dldo4>; -+ mmc-pwrseq = <&wifi_pwrseq>; -+ bus-width = <4>; -+ non-removable; -+ status = "okay"; -+}; -+ - &ohci1 { - status = "okay"; - }; -@@ -116,6 +206,14 @@ - - #include "axp803.dtsi" - -+&ac_power_supply { -+ status = "okay"; -+}; -+ -+&battery_power_supply { -+ status = "okay"; -+}; -+ - ®_aldo1 { - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; -@@ -228,6 +326,30 @@ - vcc-hdmi-supply = <®_dldo1>; - }; - -+&sound { -+ status = "okay"; -+ simple-audio-card,widgets = "Microphone", "Internal Microphone Left", -+ "Microphone", "Internal Microphone Right", -+ "Headphone", "Headphone Jack"; -+ simple-audio-card,aux-devs = <&codec_analog>; -+ simple-audio-card,routing = -+ "Left DAC", "AIF1 Slot 0 Left", -+ "Right DAC", "AIF1 Slot 0 Right", -+ "Headphone Jack", "HP", -+ "AIF1 Slot 0 Left ADC", "Left ADC", -+ "AIF1 Slot 0 Right ADC", "Right ADC", -+ "Left ADC", "ADC", -+ "Right ADC", "ADC", -+ "Internal Microphone Left", "MBIAS", -+ "MIC1", "Internal Microphone Left", -+ "Internal Microphone Right", "HBIAS", -+ "MIC2", "Internal Microphone Right"; -+}; -+ -+&sound_hdmi { -+ status = "okay"; -+}; -+ - &uart0 { - status = "okay"; diff --git a/patch/kernel/sunxi-dev/xxx-a64-olinuxino-eth.patch b/patch/kernel/sunxi-dev/xxx-a64-olinuxino-eth.patch deleted file mode 100644 index 3cf00f0c4a..0000000000 --- a/patch/kernel/sunxi-dev/xxx-a64-olinuxino-eth.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 679294497be31596e1c9c61507746d72b6b05f26 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rodrigo=20Exterck=C3=B6tter=20Tj=C3=A4der?= - -Date: Wed, 26 Sep 2018 19:48:24 +0000 -Subject: [PATCH] arm64: dts: allwinner: a64: a64-olinuxino: set the PHY TX - delay -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The PHY found on the A64-OLinuXino requires a TX delay in order to -operate properly. Olimex uses a 600ps second delay in their BSP, and -that has been found to work, so let's use that value in the current -DT. - -Signed-off-by: Rodrigo Exterckötter Tjäder -Signed-off-by: Chen-Yu Tsai ---- - arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts -index 6ef3dd4c2389d..f7a4bccaa5d40 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts -@@ -105,6 +105,7 @@ - phy-mode = "rgmii"; - phy-handle = <&ext_rgmii_phy>; - phy-supply = <®_dcdc1>; -+ allwinner,tx-delay-ps = <600>; - status = "okay"; - }; -