From ef20b8e779abb7803a59008a4ce0ad993e6f2be7 Mon Sep 17 00:00:00 2001 From: zhangn1985 <832666+zhangn1985@users.noreply.github.com> Date: Thu, 19 Sep 2019 16:50:26 +0800 Subject: [PATCH] meson64-dev: update patches due to kernel updated (#1570) Signed-off-by: Zhang Ning <832666+zhangn1985@users.noreply.github.com> --- ...01-arm64-dts-meson-gx-add-vdec-entry.patch | 40 --------- ...002-arm64-dts-meson-add-vdec-entries.patch | 67 -------------- ...ts-meson-g12a-add-video-decoder-node.patch | 47 ---------- .../general-meson64-overlays.patch | 87 +++++++++++++++---- 4 files changed, 68 insertions(+), 173 deletions(-) delete mode 100644 patch/kernel/meson64-dev/3-0001-arm64-dts-meson-gx-add-vdec-entry.patch delete mode 100644 patch/kernel/meson64-dev/3-0002-arm64-dts-meson-add-vdec-entries.patch delete mode 100644 patch/kernel/meson64-dev/3-0013-arm64-dts-meson-g12a-add-video-decoder-node.patch diff --git a/patch/kernel/meson64-dev/3-0001-arm64-dts-meson-gx-add-vdec-entry.patch b/patch/kernel/meson64-dev/3-0001-arm64-dts-meson-gx-add-vdec-entry.patch deleted file mode 100644 index a1eb62b043..0000000000 --- a/patch/kernel/meson64-dev/3-0001-arm64-dts-meson-gx-add-vdec-entry.patch +++ /dev/null @@ -1,40 +0,0 @@ -From ffda48a4f1863295886bed3785b0ca50424a2cca Mon Sep 17 00:00:00 2001 -From: Maxime Jourdan -Date: Wed, 29 Aug 2018 15:24:02 +0200 -Subject: [PATCH 01/14] arm64: dts: meson-gx: add vdec entry - -Add the video decoder dts entry - -Signed-off-by: Maxime Jourdan ---- - arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -index 6772709b9e19..373a37d8d7b2 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -@@ -437,6 +437,20 @@ - }; - }; - -+ vdec: video-decoder@c8820000 { -+ compatible = "amlogic,gx-vdec"; -+ reg = <0x0 0xc8820000 0x0 0x10000>, -+ <0x0 0xc110a580 0x0 0xe4>; -+ reg-names = "dos", "esparser"; -+ -+ interrupts = , -+ ; -+ interrupt-names = "vdec", "esparser"; -+ -+ amlogic,ao-sysctrl = <&sysctrl_AO>; -+ amlogic,canvas = <&canvas>; -+ }; -+ - periphs: periphs@c8834000 { - compatible = "simple-bus"; - reg = <0x0 0xc8834000 0x0 0x2000>; --- -2.20.1 - diff --git a/patch/kernel/meson64-dev/3-0002-arm64-dts-meson-add-vdec-entries.patch b/patch/kernel/meson64-dev/3-0002-arm64-dts-meson-add-vdec-entries.patch deleted file mode 100644 index aea93eea3e..0000000000 --- a/patch/kernel/meson64-dev/3-0002-arm64-dts-meson-add-vdec-entries.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 37b81834772f9766363761c4f9464d35a830e029 Mon Sep 17 00:00:00 2001 -From: Maxime Jourdan -Date: Wed, 29 Aug 2018 15:24:22 +0200 -Subject: [PATCH 02/14] arm64: dts: meson: add vdec entries - -This enables the video decoder for gxbb, gxl and gxm chips - -Signed-off-by: Maxime Jourdan ---- - arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 11 +++++++++++ - arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 11 +++++++++++ - arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 4 ++++ - 3 files changed, 26 insertions(+) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi -index a60d3652beee..e900a93960fb 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi -@@ -830,3 +830,14 @@ - compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu"; - power-domains = <&pwrc_vpu>; - }; -+ -+&vdec { -+ compatible = "amlogic,gxbb-vdec"; -+ clocks = <&clkc CLKID_DOS_PARSER>, -+ <&clkc CLKID_DOS>, -+ <&clkc CLKID_VDEC_1>, -+ <&clkc CLKID_VDEC_HEVC>; -+ clock-names = "dos_parser", "dos", "vdec_1", "vdec_hevc"; -+ resets = <&reset RESET_PARSER>; -+ reset-names = "esparser"; -+}; -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi -index 3093ae421b17..1d105047661e 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi -@@ -833,3 +833,14 @@ - compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-vpu"; - power-domains = <&pwrc_vpu>; - }; -+ -+&vdec { -+ compatible = "amlogic,gxl-vdec"; -+ clocks = <&clkc CLKID_DOS_PARSER>, -+ <&clkc CLKID_DOS>, -+ <&clkc CLKID_VDEC_1>, -+ <&clkc CLKID_VDEC_HEVC>; -+ clock-names = "dos_parser", "dos", "vdec_1", "vdec_hevc"; -+ resets = <&reset RESET_PARSER>; -+ reset-names = "esparser"; -+}; -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi -index 7a85a82bf65d..13e76d4136c0 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi -@@ -144,3 +144,7 @@ - &dwc3 { - phys = <&usb3_phy>, <&usb2_phy0>, <&usb2_phy1>, <&usb2_phy2>; - }; -+ -+&vdec { -+ compatible = "amlogic,gxm-vdec"; -+}; --- -2.20.1 - diff --git a/patch/kernel/meson64-dev/3-0013-arm64-dts-meson-g12a-add-video-decoder-node.patch b/patch/kernel/meson64-dev/3-0013-arm64-dts-meson-g12a-add-video-decoder-node.patch deleted file mode 100644 index 98a9552364..0000000000 --- a/patch/kernel/meson64-dev/3-0013-arm64-dts-meson-g12a-add-video-decoder-node.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 58726211ff2512f9cd9545b687b63aaeed06abd9 Mon Sep 17 00:00:00 2001 -From: Maxime Jourdan -Date: Tue, 5 Feb 2019 14:34:45 +0100 -Subject: [PATCH 13/14] arm64: dts: meson-g12a: add video decoder node - -Signed-off-by: Maxime Jourdan ---- - arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 23 +++++++++++++++++++++ - 1 file changed, 23 insertions(+) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi -index 9f72396ba710..dc726b3e1a1a 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi -@@ -480,6 +480,29 @@ - }; - }; - -+ vdec: video-decoder@ff620000 { -+ compatible = "amlogic,g12a-vdec"; -+ reg = <0x0 0xff620000 0x0 0x10000>, -+ <0x0 0xffd0e180 0x0 0xe4>; -+ reg-names = "dos", "esparser"; -+ -+ interrupts = , -+ ; -+ interrupt-names = "vdec", "esparser"; -+ -+ amlogic,ao-sysctrl = <&rti>; -+ amlogic,canvas = <&canvas>; -+ -+ clocks = <&clkc CLKID_PARSER>, -+ <&clkc CLKID_DOS>, -+ <&clkc CLKID_VDEC_1>, -+ <&clkc CLKID_VDEC_HEVC>, -+ <&clkc CLKID_VDEC_HEVCF>; -+ clock-names = "dos_parser", "dos", "vdec_1", "vdec_hevc", "vdec_hevcf"; -+ resets = <&reset RESET_PARSER>; -+ reset-names = "esparser"; -+ }; -+ - vpu: vpu@ff900000 { - compatible = "amlogic,meson-g12a-vpu"; - reg = <0x0 0xff900000 0x0 0x100000>, --- -2.20.1 - diff --git a/patch/kernel/meson64-dev/general-meson64-overlays.patch b/patch/kernel/meson64-dev/general-meson64-overlays.patch index 71c2a02b86..ee92f3b36b 100644 --- a/patch/kernel/meson64-dev/general-meson64-overlays.patch +++ b/patch/kernel/meson64-dev/general-meson64-overlays.patch @@ -1,15 +1,61 @@ -diff --git a/arch/arm64/boot/dts/amlogic/Makefile~ b/arch/arm64/boot/dts/amlogic/Makefile -index a97c0e2..2671344 100644 +From 58c5526eb1798e61e4e76d37140cf10c8d325bc7 Mon Sep 17 00:00:00 2001 +From: Zhang Ning <832666+zhangn1985@users.noreply.github.com> +Date: Thu, 19 Sep 2019 16:20:31 +0800 +Subject: [PATCH] general: meson64 overlays + +Signed-off-by: Zhang Ning <832666+zhangn1985@users.noreply.github.com> +--- + arch/arm64/boot/dts/amlogic/Makefile | 2 ++ + arch/arm64/boot/dts/amlogic/Makefile.rej | 8 +++++ + arch/arm64/boot/dts/amlogic/overlay/Makefile | 20 ++++++++++++ + .../dts/amlogic/overlay/README.meson-overlays | 20 ++++++++++++ + .../dts/amlogic/overlay/meson-fixup.scr-cmd | 4 +++ + .../boot/dts/amlogic/overlay/meson-i2cA.dts | 17 ++++++++++ + .../boot/dts/amlogic/overlay/meson-i2cB.dts | 17 ++++++++++ + .../boot/dts/amlogic/overlay/meson-uartA.dts | 11 +++++++ + .../boot/dts/amlogic/overlay/meson-uartC.dts | 11 +++++++ + .../dts/amlogic/overlay/meson-w1-gpio.dts | 20 ++++++++++++ + .../dts/amlogic/overlay/meson-w1AB-gpio.dts | 32 +++++++++++++++++++ + scripts/Makefile.lib | 3 ++ + 12 files changed, 165 insertions(+) + create mode 100644 arch/arm64/boot/dts/amlogic/Makefile.rej + create mode 100644 arch/arm64/boot/dts/amlogic/overlay/Makefile + create mode 100644 arch/arm64/boot/dts/amlogic/overlay/README.meson-overlays + create mode 100644 arch/arm64/boot/dts/amlogic/overlay/meson-fixup.scr-cmd + create mode 100644 arch/arm64/boot/dts/amlogic/overlay/meson-i2cA.dts + create mode 100644 arch/arm64/boot/dts/amlogic/overlay/meson-i2cB.dts + create mode 100644 arch/arm64/boot/dts/amlogic/overlay/meson-uartA.dts + create mode 100644 arch/arm64/boot/dts/amlogic/overlay/meson-uartC.dts + create mode 100644 arch/arm64/boot/dts/amlogic/overlay/meson-w1-gpio.dts + create mode 100644 arch/arm64/boot/dts/amlogic/overlay/meson-w1AB-gpio.dts + +diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile +index 84afecba9ec0..f726804d32ed 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -26,3 +26,5 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb +@@ -36,3 +36,5 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-sm1-sei610.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l.dtb + +subdir-y := $(dts-dirs) overlay +diff --git a/arch/arm64/boot/dts/amlogic/Makefile.rej b/arch/arm64/boot/dts/amlogic/Makefile.rej +new file mode 100644 +index 000000000000..5a34b7af8dac +--- /dev/null ++++ b/arch/arm64/boot/dts/amlogic/Makefile.rej +@@ -0,0 +1,8 @@ ++--- arch/arm64/boot/dts/amlogic/Makefile +++++ arch/arm64/boot/dts/amlogic/Makefile ++@@ -26,3 +26,5 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb ++ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb ++ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb ++ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb +++ +++subdir-y := $(dts-dirs) overlay diff --git a/arch/arm64/boot/dts/amlogic/overlay/Makefile b/arch/arm64/boot/dts/amlogic/overlay/Makefile -index e69de29..576e190 100644 +new file mode 100644 +index 000000000000..8630fd1a182d --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/overlay/Makefile @@ -0,0 +1,20 @@ @@ -33,9 +79,9 @@ index e69de29..576e190 100644 +always := $(dtbo-y) $(scr-y) $(dtbotxt-y) +clean-files := *.dtbo *.scr + -+ diff --git a/arch/arm64/boot/dts/amlogic/overlay/README.meson-overlays b/arch/arm64/boot/dts/amlogic/overlay/README.meson-overlays -index e69de29..9512445 100644 +new file mode 100644 +index 000000000000..1b169a7a1525 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/overlay/README.meson-overlays @@ -0,0 +1,20 @@ @@ -61,7 +107,7 @@ index e69de29..9512445 100644 + diff --git a/arch/arm64/boot/dts/amlogic/overlay/meson-fixup.scr-cmd b/arch/arm64/boot/dts/amlogic/overlay/meson-fixup.scr-cmd new file mode 100644 -index 0000000..d4c39e2 +index 000000000000..d4c39e20a3a2 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/overlay/meson-fixup.scr-cmd @@ -0,0 +1,4 @@ @@ -71,7 +117,7 @@ index 0000000..d4c39e2 + diff --git a/arch/arm64/boot/dts/amlogic/overlay/meson-i2cA.dts b/arch/arm64/boot/dts/amlogic/overlay/meson-i2cA.dts new file mode 100644 -index 0000000..700c2dd +index 000000000000..bfb72feb7e36 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/overlay/meson-i2cA.dts @@ -0,0 +1,17 @@ @@ -94,7 +140,7 @@ index 0000000..700c2dd +}; diff --git a/arch/arm64/boot/dts/amlogic/overlay/meson-i2cB.dts b/arch/arm64/boot/dts/amlogic/overlay/meson-i2cB.dts new file mode 100644 -index 0000000..700c2dd +index 000000000000..d75867bce99b --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/overlay/meson-i2cB.dts @@ -0,0 +1,17 @@ @@ -117,7 +163,7 @@ index 0000000..700c2dd +}; diff --git a/arch/arm64/boot/dts/amlogic/overlay/meson-uartA.dts b/arch/arm64/boot/dts/amlogic/overlay/meson-uartA.dts new file mode 100644 -index 0000000..2b40ee4 +index 000000000000..3aecd60aaf64 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/overlay/meson-uartA.dts @@ -0,0 +1,11 @@ @@ -134,7 +180,7 @@ index 0000000..2b40ee4 +}; diff --git a/arch/arm64/boot/dts/amlogic/overlay/meson-uartC.dts b/arch/arm64/boot/dts/amlogic/overlay/meson-uartC.dts new file mode 100644 -index 0000000..2b40ee4 +index 000000000000..2b40ee4c02d3 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/overlay/meson-uartC.dts @@ -0,0 +1,11 @@ @@ -151,7 +197,7 @@ index 0000000..2b40ee4 +}; diff --git a/arch/arm64/boot/dts/amlogic/overlay/meson-w1-gpio.dts b/arch/arm64/boot/dts/amlogic/overlay/meson-w1-gpio.dts new file mode 100644 -index 0000000..ac76a4f +index 000000000000..ac76a4f20ab7 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/overlay/meson-w1-gpio.dts @@ -0,0 +1,20 @@ @@ -177,7 +223,7 @@ index 0000000..ac76a4f +}; diff --git a/arch/arm64/boot/dts/amlogic/overlay/meson-w1AB-gpio.dts b/arch/arm64/boot/dts/amlogic/overlay/meson-w1AB-gpio.dts new file mode 100644 -index 0000000..ac76a4f +index 000000000000..f6b0d7eff158 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/overlay/meson-w1AB-gpio.dts @@ -0,0 +1,32 @@ @@ -214,12 +260,12 @@ index 0000000..ac76a4f + }; +}; diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 26e6af4..65b9435 100644 +index 41c50f9461e5..387659d5b252 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib -@@ -65,6 +65,9 @@ real-objs-m := $(foreach m, $(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y) - extra-y += $(dtb-y) - extra-$(CONFIG_OF_ALL_DTBS) += $(dtb-) +@@ -79,6 +79,9 @@ header-test-y += $(filter-out $(header-test-), \ + + extra-$(CONFIG_HEADER_TEST) += $(addsuffix .s, $(header-test-y) $(header-test-m)) +# Overlay targets +extra-y += $(dtbo-y) $(scr-y) $(dtbotxt-y) @@ -227,3 +273,6 @@ index 26e6af4..65b9435 100644 # Add subdir path extra-y := $(addprefix $(obj)/,$(extra-y)) +-- +2.20.1 +