From a00375179bbc27bac4b39927133578a3f2dae383 Mon Sep 17 00:00:00 2001 From: Martin Ayotte Date: Wed, 14 Aug 2019 09:23:05 -0400 Subject: [PATCH] switch sunxi-dev to 5.3.0-rc3 --- config/sources/sun50iw6.conf | 2 +- config/sources/sunxi64_common.inc | 2 +- config/sources/sunxi_common.inc | 2 +- ...0-general-h6-add-dma-i2c-ir-spi-uart.patch | 11 +--- ...winner-a64-add-pinmux-for-RGB666-LCD.patch | 37 -------------- patch/kernel/sunxi-dev/xxx-teres-fixed.patch | 51 ++++--------------- 6 files changed, 14 insertions(+), 91 deletions(-) delete mode 100644 patch/kernel/sunxi-dev/0131-arm64-allwinner-a64-add-pinmux-for-RGB666-LCD.patch diff --git a/config/sources/sun50iw6.conf b/config/sources/sun50iw6.conf index 7e152a9a8f..521af48c5d 100644 --- a/config/sources/sun50iw6.conf +++ b/config/sources/sun50iw6.conf @@ -36,7 +36,7 @@ case $BRANCH in #KERNELSOURCE=$MAINLINE_KERNEL_SOURCE KERNELSOURCE="https://github.com/megous/linux" - KERNELBRANCH="branch:orange-pi-5.2" + KERNELBRANCH="branch:orange-pi-5.3" KERNELPATCHDIR='sunxi-dev' KERNELDIR=$MAINLINE_KERNEL_DIR diff --git a/config/sources/sunxi64_common.inc b/config/sources/sunxi64_common.inc index d260651bb2..da40a54bf7 100644 --- a/config/sources/sunxi64_common.inc +++ b/config/sources/sunxi64_common.inc @@ -53,7 +53,7 @@ case $BRANCH in #KERNELSOURCE=$MAINLINE_KERNEL_SOURCE KERNELSOURCE="https://github.com/megous/linux" - KERNELBRANCH="branch:orange-pi-5.2" + KERNELBRANCH="branch:orange-pi-5.3" KERNELDIR=$MAINLINE_KERNEL_DIR KERNELPATCHDIR='sunxi-dev' KERNEL_USE_GCC='> 7.0' diff --git a/config/sources/sunxi_common.inc b/config/sources/sunxi_common.inc index ea9330284c..6e5c2df445 100644 --- a/config/sources/sunxi_common.inc +++ b/config/sources/sunxi_common.inc @@ -39,7 +39,7 @@ case $BRANCH in #KERNELSOURCE=$MAINLINE_KERNEL_SOURCE KERNELSOURCE="https://github.com/megous/linux" - KERNELBRANCH="branch:orange-pi-5.2" + KERNELBRANCH="branch:orange-pi-5.3" KERNELDIR=$MAINLINE_KERNEL_DIR KERNELPATCHDIR='sunxi-dev' KERNEL_USE_GCC='> 7.0' diff --git a/patch/kernel/sunxi-dev/0010-general-h6-add-dma-i2c-ir-spi-uart.patch b/patch/kernel/sunxi-dev/0010-general-h6-add-dma-i2c-ir-spi-uart.patch index 018db61bfe..e45f1266b5 100644 --- a/patch/kernel/sunxi-dev/0010-general-h6-add-dma-i2c-ir-spi-uart.patch +++ b/patch/kernel/sunxi-dev/0010-general-h6-add-dma-i2c-ir-spi-uart.patch @@ -15,19 +15,10 @@ index dc785da9c..141fd186b 100644 opp@1800000000 { opp-hz = /bits/ 64 <1800000000>; opp-microvolt = <1160000 1160000 1160000>; -@@ -254,6 +260,26 @@ +@@ -254,6 +260,17 @@ #reset-cells = <1>; }; -+ dma: dma-controller@3002000 { -+ compatible = "allwinner,sun8i-h3-dma"; -+ reg = <0x03002000 0x1000>; -+ interrupts = ; -+ clocks = <&ccu CLK_BUS_DMA>; -+ resets = <&ccu RST_BUS_DMA>; -+ #dma-cells = <1>; -+ }; -+ + gic: interrupt-controller@3021000 { + compatible = "arm,gic-400"; + reg = <0x03021000 0x1000>, diff --git a/patch/kernel/sunxi-dev/0131-arm64-allwinner-a64-add-pinmux-for-RGB666-LCD.patch b/patch/kernel/sunxi-dev/0131-arm64-allwinner-a64-add-pinmux-for-RGB666-LCD.patch deleted file mode 100644 index 4c7d893ad6..0000000000 --- a/patch/kernel/sunxi-dev/0131-arm64-allwinner-a64-add-pinmux-for-RGB666-LCD.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3d017794525d830a3251bed7ebbacbf74efe9605 Mon Sep 17 00:00:00 2001 -From: Icenowy Zheng -Date: Thu, 18 Oct 2018 15:33:24 +0800 -Subject: [PATCH 131/146] arm64: allwinner: a64: add pinmux for RGB666 LCD - -Allwinner A64's TCON0 can output RGB666 LCD signal. - -Add its pinmux. - -Signed-off-by: Icenowy Zheng ---- - arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi -index cb7d4a96e789..0f5b412cfc81 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi -@@ -655,6 +655,15 @@ - function = "i2c1"; - }; - -+ lcd_rgb666_pins: lcd-rgb666 { -+ pins = "PD0", "PD1", "PD2", "PD3", "PD4", -+ "PD5", "PD6", "PD7", "PD8", "PD9", -+ "PD10", "PD11", "PD12", "PD13", -+ "PD14", "PD15", "PD16", "PD17", -+ "PD18", "PD19", "PD20", "PD21"; -+ function = "lcd0"; -+ }; -+ - mmc0_pins: mmc0-pins { - pins = "PF0", "PF1", "PF2", "PF3", - "PF4", "PF5"; --- -2.17.1 - diff --git a/patch/kernel/sunxi-dev/xxx-teres-fixed.patch b/patch/kernel/sunxi-dev/xxx-teres-fixed.patch index fd27a3aa42..2ae1188e0b 100644 --- a/patch/kernel/sunxi-dev/xxx-teres-fixed.patch +++ b/patch/kernel/sunxi-dev/xxx-teres-fixed.patch @@ -1,5 +1,5 @@ diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts -index c455b24dd..9f018de23 100644 +index 1069e70..8fbdab7 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts @@ -19,6 +19,15 @@ @@ -17,8 +17,8 @@ index c455b24dd..9f018de23 100644 + enable-gpios = <&pio 3 23 GPIO_ACTIVE_HIGH>; /* PD23 */ }; - chosen { -@@ -42,6 +51,17 @@ + backlight: backlight { +@@ -51,6 +60,17 @@ }; }; @@ -36,34 +36,10 @@ index c455b24dd..9f018de23 100644 leds { compatible = "gpio-leds"; -@@ -66,26 +86,83 @@ - status = "okay"; - }; - -+ speaker_amp: speaker_amp { -+ compatible = "simple-audio-amplifier"; -+ VCC-supply = <®_aldo2>; -+ enable-gpios = <&r_pio 0 12 GPIO_ACTIVE_HIGH>; /*PL12*/ -+ }; -+ - wifi_pwrseq: wifi_pwrseq { - compatible = "mmc-pwrseq-simple"; - reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */ - }; +@@ -100,6 +120,16 @@ + status = "okay"; }; -+&codec { -+ status = "okay"; -+}; -+ -+&codec_analog { -+ status = "okay"; -+}; -+ -+&dai { -+ status = "okay"; -+}; -+ +&de { + status = "okay"; +}; @@ -77,16 +53,9 @@ index c455b24dd..9f018de23 100644 &ehci1 { status = "okay"; }; - - --/* The ANX6345 eDP-bridge is on i2c0. There is no linux (mainline) -- * driver for this chip at the moment, the bootloader initializes it. -- * However it can be accessed with the i2c-dev driver from user space. -- */ +@@ -112,6 +142,39 @@ &i2c0 { clock-frequency = <100000>; - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins>; status = "okay"; + + anx6345: anx6345@38 { @@ -124,7 +93,7 @@ index c455b24dd..9f018de23 100644 }; &mmc0 { -@@ -127,6 +204,12 @@ +@@ -153,6 +216,12 @@ status = "okay"; }; @@ -137,7 +106,7 @@ index c455b24dd..9f018de23 100644 &ohci1 { status = "okay"; }; -@@ -143,6 +230,29 @@ +@@ -173,6 +242,29 @@ }; }; @@ -167,8 +136,8 @@ index c455b24dd..9f018de23 100644 #include "axp803.dtsi" &ac_power_supply { -@@ -266,12 +376,48 @@ - vcc-hdmi-supply = <®_dldo1>; +@@ -319,12 +411,48 @@ + status = "okay"; }; +&sound_hdmi {