From 541e0d2f279502e574801b8bd788ab50b56e33af Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 17 Feb 2023 05:52:57 +0000 Subject: [PATCH] u-boot: update patches for BananaPi M2-Pro and M2S support --- ...son64-prevent-stdout-stderr-on-video.patch | 4 +- ...son64-remove-amlogic-so-fdtdir-finds.patch | 4 +- ...gic-odroid-n2-remove-amlogic-prefix-.patch | 4 +- ...ts-meson-nanopi-k2-readd-PHY-reset-p.patch | 4 +- ...rt-WeTek-Hub-Play2-DTs-from-Linux-5..patch | 4 +- ...snps-reset-on-WeTek-devices-to-fix-E.patch | 4 +- ...ic-add-board-files-for-wetek-gxbb-de.patch | 4 +- ...ards-amlogic-add-WeTek-Hub-defconfig.patch | 4 +- ...ds-amlogic-add-WeTek-Play2-defconfig.patch | 4 +- ...-ARM-dts-add-support-for-Radxa-Zero2.patch | 4 +- ...ds-amlogic-add-Radxa-Zero2-defconfig.patch | 4 +- ...oards-amlogic-update-for-Radxa-Zero2.patch | 4 +- ...mport-Beelink-GT1-DT-from-Linux-5.21.patch | 4 +- ...ds-amlogic-add-Beelink-GT1-defconfig.patch | 4 +- ...oards-amlogic-update-for-Beelink-GT1.patch | 4 +- ...-ARM-dts-convert-bananapi-m5-to-dtsi.patch | 936 ++++++++++++++++++ ...-dts-add-support-for-BananaPi-M2-Pro.patch | 152 +++ ...boards-add-BananaPi-M2-Pro-defconfig.patch | 96 ++ ...s-amlogic-update-for-BananaPi-M2-Pro.patch | 49 + ...IP-boards-add-BananaPi-M2S-defconfig.patch | 102 ++ ...ards-amlogic-update-for-BananaPi-M2S.patch | 40 + ...ARM-dts-add-support-for-BananaPi-M2S.patch | 651 ++++++++++++ 22 files changed, 2056 insertions(+), 30 deletions(-) create mode 100644 projects/Amlogic/patches/u-boot/u-boot-0016-WIP-ARM-dts-convert-bananapi-m5-to-dtsi.patch create mode 100644 projects/Amlogic/patches/u-boot/u-boot-0017-WIP-ARM-dts-add-support-for-BananaPi-M2-Pro.patch create mode 100644 projects/Amlogic/patches/u-boot/u-boot-0018-WIP-boards-add-BananaPi-M2-Pro-defconfig.patch create mode 100644 projects/Amlogic/patches/u-boot/u-boot-0019-WIP-docs-boards-amlogic-update-for-BananaPi-M2-Pro.patch create mode 100644 projects/Amlogic/patches/u-boot/u-boot-0020-WIP-boards-add-BananaPi-M2S-defconfig.patch create mode 100644 projects/Amlogic/patches/u-boot/u-boot-0021-WIP-docs-boards-amlogic-update-for-BananaPi-M2S.patch create mode 100644 projects/Amlogic/patches/u-boot/u-boot-0022-WIP-ARM-dts-add-support-for-BananaPi-M2S.patch diff --git a/projects/Amlogic/patches/u-boot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch b/projects/Amlogic/patches/u-boot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch index 23dcb8dd1c..a5bdb26d5d 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch @@ -1,7 +1,7 @@ From 95ed57b0ca24cde1d7547878101c62f552cb1160 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 13 Nov 2020 02:09:36 +0000 -Subject: [PATCH 01/15] LOCAL: configs: meson64: prevent stdout/stderr on +Subject: [PATCH 01/22] LOCAL: configs: meson64: prevent stdout/stderr on videoconsole Several devices have CONFIG_DM_VIDEO enabled which causes stdout/stderr @@ -27,5 +27,5 @@ index 40803ee9da..05b1fcb9fd 100644 #define STDOUT_CFG "serial" #endif -- -2.17.1 +2.34.1 diff --git a/projects/Amlogic/patches/u-boot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch b/projects/Amlogic/patches/u-boot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch index c55aa2636c..8b93165b7c 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch @@ -1,7 +1,7 @@ From d16384b766e1704470f678589e01d288fbb94960 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 22 Apr 2021 06:52:50 +0000 -Subject: [PATCH 02/15] LOCAL: configs: meson64: remove /amlogic so fdtdir +Subject: [PATCH 02/22] LOCAL: configs: meson64: remove /amlogic so fdtdir finds LE boot files --- @@ -22,5 +22,5 @@ index 05b1fcb9fd..c4af944382 100644 #endif -- -2.17.1 +2.34.1 diff --git a/projects/Amlogic/patches/u-boot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch b/projects/Amlogic/patches/u-boot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch index 89bafafc0a..bcebc030c5 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch @@ -1,7 +1,7 @@ From a9fc1d56916fbcf4e00a1dd7543c9f53d697477a Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 3 Aug 2021 18:42:55 +0000 -Subject: [PATCH 03/15] LOCAL: board: amlogic: odroid-n2: remove /amlogic/ +Subject: [PATCH 03/22] LOCAL: board: amlogic: odroid-n2: remove /amlogic/ prefix for dtb path Remove the /amlogic/ prefix to align with current LE dtb locations. @@ -25,5 +25,5 @@ index 2135457edd..ec1f4efc11 100644 } -- -2.17.1 +2.34.1 diff --git a/projects/Amlogic/patches/u-boot/u-boot-0004-BACKPORT-arm64-dts-meson-nanopi-k2-readd-PHY-reset-p.patch b/projects/Amlogic/patches/u-boot/u-boot-0004-BACKPORT-arm64-dts-meson-nanopi-k2-readd-PHY-reset-p.patch index 902b95070a..c94e8c8e84 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0004-BACKPORT-arm64-dts-meson-nanopi-k2-readd-PHY-reset-p.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0004-BACKPORT-arm64-dts-meson-nanopi-k2-readd-PHY-reset-p.patch @@ -1,7 +1,7 @@ From 7d8355053316d3f760a5ac14156e77e27aa5f6d5 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 25 Oct 2022 14:24:21 +0000 -Subject: [PATCH 04/15] BACKPORT: arm64: dts: meson: nanopi-k2: readd PHY reset +Subject: [PATCH 04/22] BACKPORT: arm64: dts: meson: nanopi-k2: readd PHY reset properties The sync of device-tree/bindings in 11a48a5a18c6 ("Linux 5.6-rc2") causes @@ -34,5 +34,5 @@ index c35158d7e9..2a245bbe7f 100644 +}; + -- -2.17.1 +2.34.1 diff --git a/projects/Amlogic/patches/u-boot/u-boot-0005-WIP-ARM-dts-import-WeTek-Hub-Play2-DTs-from-Linux-5..patch b/projects/Amlogic/patches/u-boot/u-boot-0005-WIP-ARM-dts-import-WeTek-Hub-Play2-DTs-from-Linux-5..patch index 1184a1d628..cb830c8ede 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0005-WIP-ARM-dts-import-WeTek-Hub-Play2-DTs-from-Linux-5..patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0005-WIP-ARM-dts-import-WeTek-Hub-Play2-DTs-from-Linux-5..patch @@ -1,7 +1,7 @@ From f72090a5d057a18fa8bceec0400c212012f56126 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 20 Apr 2021 05:19:43 +0000 -Subject: [PATCH 05/15] WIP: ARM: dts: import WeTek Hub/Play2 DTs from Linux +Subject: [PATCH 05/22] WIP: ARM: dts: import WeTek Hub/Play2 DTs from Linux 5.19 Import the WeTek common dtsi and Hub/Play2 device-trees. @@ -550,5 +550,5 @@ index 0000000000..3c3eeb148e + status = "okay"; +}; -- -2.17.1 +2.34.1 diff --git a/projects/Amlogic/patches/u-boot/u-boot-0006-WIP-ARM-dts-use-snps-reset-on-WeTek-devices-to-fix-E.patch b/projects/Amlogic/patches/u-boot/u-boot-0006-WIP-ARM-dts-use-snps-reset-on-WeTek-devices-to-fix-E.patch index 1079cec788..c29d217a9b 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0006-WIP-ARM-dts-use-snps-reset-on-WeTek-devices-to-fix-E.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0006-WIP-ARM-dts-use-snps-reset-on-WeTek-devices-to-fix-E.patch @@ -1,7 +1,7 @@ From 4df4197e1eb7e257d0c4dda60a7ff427fbd47c6f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 20 Apr 2021 05:29:19 +0000 -Subject: [PATCH 06/15] WIP: ARM: dts: use snps,reset on WeTek devices to fix +Subject: [PATCH 06/22] WIP: ARM: dts: use snps,reset on WeTek devices to fix Ethernet The sync of the device tree and dt-bindings from Linux v5.6-rc2 @@ -48,5 +48,5 @@ index c35158d7e9..2a245bbe7f 100644 +}; + -- -2.17.1 +2.34.1 diff --git a/projects/Amlogic/patches/u-boot/u-boot-0007-WIP-boards-amlogic-add-board-files-for-wetek-gxbb-de.patch b/projects/Amlogic/patches/u-boot/u-boot-0007-WIP-boards-amlogic-add-board-files-for-wetek-gxbb-de.patch index d6a6fc9132..9f9800b6dd 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0007-WIP-boards-amlogic-add-board-files-for-wetek-gxbb-de.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0007-WIP-boards-amlogic-add-board-files-for-wetek-gxbb-de.patch @@ -1,7 +1,7 @@ From cec8965a83baea925ac82ca0be5dac3cc1823915 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 22 Apr 2021 05:45:29 +0000 -Subject: [PATCH 07/15] WIP: boards: amlogic: add board files for wetek-gxbb +Subject: [PATCH 07/22] WIP: boards: amlogic: add board files for wetek-gxbb devices These support the WeTek Hub and Play2 devices. @@ -99,5 +99,5 @@ index 0000000000..fb07eefa53 + return 0; +} -- -2.17.1 +2.34.1 diff --git a/projects/Amlogic/patches/u-boot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch index 6daf511186..0dce3407b3 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch @@ -1,7 +1,7 @@ From 8b7dfec310b69a5b7cafacbe11a3ca36b497c78c Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 27 Feb 2021 06:03:00 +0000 -Subject: [PATCH 08/15] WIP: boards: amlogic: add WeTek Hub defconfig +Subject: [PATCH 08/22] WIP: boards: amlogic: add WeTek Hub defconfig Signed-of-by: Christian Hewitt --- @@ -87,5 +87,5 @@ index 0000000000..9ad263ca2c +CONFIG_BMP_32BPP=y +CONFIG_OF_LIBFDT_OVERLAY=y -- -2.17.1 +2.34.1 diff --git a/projects/Amlogic/patches/u-boot/u-boot-0009-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0009-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch index 2a2fec8476..41b94fd28a 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0009-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0009-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch @@ -1,7 +1,7 @@ From e45b57304c28592eae3ad386559abb6dd3a7a802 Mon Sep 17 00:00:00 2001 From: chewitt Date: Sat, 27 Feb 2021 06:04:00 +0000 -Subject: [PATCH 09/15] WIP: boards: amlogic: add WeTek Play2 defconfig +Subject: [PATCH 09/22] WIP: boards: amlogic: add WeTek Play2 defconfig Signed-off-by: Christian Hewittt --- @@ -87,5 +87,5 @@ index 0000000000..624679f90c +CONFIG_BMP_32BPP=y +CONFIG_OF_LIBFDT_OVERLAY=y -- -2.17.1 +2.34.1 diff --git a/projects/Amlogic/patches/u-boot/u-boot-0010-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch b/projects/Amlogic/patches/u-boot/u-boot-0010-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch index 19fa0ce744..3c3b36f534 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0010-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0010-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch @@ -1,7 +1,7 @@ From 7a49690898b3af72646df09784b8cdd9b1b593fd Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 15 Jan 2022 06:17:23 +0000 -Subject: [PATCH 10/15] WIP: ARM: dts: add support for Radxa Zero2 +Subject: [PATCH 10/22] WIP: ARM: dts: add support for Radxa Zero2 Import the initial dts (WIP) from chewitt/amlogic-5.16.y @@ -539,5 +539,5 @@ index 0000000000..f0c9ef8592 + status = "okay"; +}; -- -2.17.1 +2.34.1 diff --git a/projects/Amlogic/patches/u-boot/u-boot-0011-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0011-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch index b3a36ba97d..547babb8a7 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0011-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0011-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch @@ -1,7 +1,7 @@ From e7babbfd6c66c20e81e9d728a6a4384a9a5885dd Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 15 Jan 2022 06:23:29 +0000 -Subject: [PATCH 11/15] WIP: boards: amlogic: add Radxa Zero2 defconfig +Subject: [PATCH 11/22] WIP: boards: amlogic: add Radxa Zero2 defconfig Add a defconfig for the Radxa Zero2 SBC, using an Amlogic A311D chip. @@ -106,5 +106,5 @@ index 0000000000..3ef3c9c143 +CONFIG_BMP_32BPP=y +CONFIG_OF_LIBFDT_OVERLAY=y -- -2.17.1 +2.34.1 diff --git a/projects/Amlogic/patches/u-boot/u-boot-0012-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch b/projects/Amlogic/patches/u-boot/u-boot-0012-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch index a974cdce54..e1d7cead98 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0012-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0012-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch @@ -1,7 +1,7 @@ From 2fc65ac09a5698b9e2060890de1cd3310a237658 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 15 Jan 2022 06:35:47 +0000 -Subject: [PATCH 12/15] WIP: doc: boards: amlogic: update for Radxa Zero2 +Subject: [PATCH 12/22] WIP: doc: boards: amlogic: update for Radxa Zero2 Add documentation bits for the Radxa Zero2 @@ -119,5 +119,5 @@ index f5611f52ec..95a42a05d0 100644 This will generate: -- -2.17.1 +2.34.1 diff --git a/projects/Amlogic/patches/u-boot/u-boot-0013-WIP-ARM-dts-import-Beelink-GT1-DT-from-Linux-5.21.patch b/projects/Amlogic/patches/u-boot/u-boot-0013-WIP-ARM-dts-import-Beelink-GT1-DT-from-Linux-5.21.patch index dfb16223f6..786a26d81c 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0013-WIP-ARM-dts-import-Beelink-GT1-DT-from-Linux-5.21.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0013-WIP-ARM-dts-import-Beelink-GT1-DT-from-Linux-5.21.patch @@ -1,7 +1,7 @@ From 7ce3779954032f9ac2591a02df06282115032cb3 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 7 Jul 2022 10:24:03 +0000 -Subject: [PATCH 13/15] WIP: ARM: dts: import Beelink GT1 DT from Linux 5.21 +Subject: [PATCH 13/22] WIP: ARM: dts: import Beelink GT1 DT from Linux 5.21 Import the Beelink GT1 device-tree. @@ -124,5 +124,5 @@ index 0000000000..2c267884cc + }; +}; -- -2.17.1 +2.34.1 diff --git a/projects/Amlogic/patches/u-boot/u-boot-0014-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0014-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch index 60429c72be..24bdcda648 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0014-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0014-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch @@ -1,7 +1,7 @@ From 7416bc16b956d7b9b2761ac5511c6b51ac8b4ca1 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 7 Jul 2022 10:27:01 +0000 -Subject: [PATCH 14/15] WIP: boards: amlogic: add Beelink GT1 defconfig +Subject: [PATCH 14/22] WIP: boards: amlogic: add Beelink GT1 defconfig Add a board config for Beelink GT1 devices @@ -89,5 +89,5 @@ index 0000000000..77ffc9aa49 +CONFIG_VIDEO_DT_SIMPLEFB=y +CONFIG_OF_LIBFDT_OVERLAY=y -- -2.17.1 +2.34.1 diff --git a/projects/Amlogic/patches/u-boot/u-boot-0015-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch b/projects/Amlogic/patches/u-boot/u-boot-0015-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch index 7e836e397c..5b3f11a276 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0015-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0015-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch @@ -1,7 +1,7 @@ From 5c21b65a0efdae590e0d0ecd1191078725e4abf4 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 14 Jul 2022 19:38:41 +0000 -Subject: [PATCH 15/15] WIP: doc: boards: amlogic: update for Beelink GT1 +Subject: [PATCH 15/22] WIP: doc: boards: amlogic: update for Beelink GT1 Add documentation bits for the Beelink GT1 and GT1-Ultimate @@ -161,5 +161,5 @@ index f0b92e4209..b8b6f9b98a 100644 jethub-j80 khadas-vim2 -- -2.17.1 +2.34.1 diff --git a/projects/Amlogic/patches/u-boot/u-boot-0016-WIP-ARM-dts-convert-bananapi-m5-to-dtsi.patch b/projects/Amlogic/patches/u-boot/u-boot-0016-WIP-ARM-dts-convert-bananapi-m5-to-dtsi.patch new file mode 100644 index 0000000000..eef144642c --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0016-WIP-ARM-dts-convert-bananapi-m5-to-dtsi.patch @@ -0,0 +1,936 @@ +From 0addaf5179afa1c985f493035a1dca8f1b23a4ed Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Fri, 17 Feb 2023 05:37:13 +0000 +Subject: [PATCH 16/22] WIP: ARM: dts: convert bananapi-m5 to dtsi + +Signed-off-by: Christian Hewitt +--- + arch/arm/dts/meson-sm1-bananapi-m5.dts | 426 +----------------------- + arch/arm/dts/meson-sm1-bananapi.dtsi | 435 +++++++++++++++++++++++++ + 2 files changed, 436 insertions(+), 425 deletions(-) + create mode 100644 arch/arm/dts/meson-sm1-bananapi.dtsi + +diff --git a/arch/arm/dts/meson-sm1-bananapi-m5.dts b/arch/arm/dts/meson-sm1-bananapi-m5.dts +index effaa138b5..34b3238ee0 100644 +--- a/arch/arm/dts/meson-sm1-bananapi-m5.dts ++++ b/arch/arm/dts/meson-sm1-bananapi-m5.dts +@@ -6,10 +6,7 @@ + + /dts-v1/; + +-#include "meson-sm1.dtsi" +-#include +-#include +-#include ++#include "meson-sm1-bananapi.dtsi" + #include + #include + +@@ -17,28 +14,6 @@ + compatible = "bananapi,bpi-m5", "amlogic,sm1"; + model = "Banana Pi BPI-M5"; + +- adc_keys { +- compatible = "adc-keys"; +- io-channels = <&saradc 2>; +- io-channel-names = "buttons"; +- keyup-threshold-microvolt = <1800000>; +- +- key { +- label = "SW3"; +- linux,code = ; +- press-threshold-microvolt = <1700000>; +- }; +- }; +- +- aliases { +- serial0 = &uart_AO; +- ethernet0 = ðmac; +- }; +- +- chosen { +- stdout-path = "serial0:115200n8"; +- }; +- + /* TOFIX: handle CVBS_DET on SARADC channel 0 */ + cvbs-connector { + compatible = "composite-video-connector"; +@@ -50,150 +25,6 @@ + }; + }; + +- emmc_pwrseq: emmc-pwrseq { +- compatible = "mmc-pwrseq-emmc"; +- reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; +- }; +- +- gpio-keys { +- compatible = "gpio-keys"; +- +- key { +- label = "SW1"; +- linux,code = ; +- gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>; +- interrupt-parent = <&gpio_intc>; +- interrupts = <3 IRQ_TYPE_EDGE_BOTH>; +- }; +- }; +- +- hdmi-connector { +- compatible = "hdmi-connector"; +- type = "a"; +- +- port { +- hdmi_connector_in: endpoint { +- remote-endpoint = <&hdmi_tx_tmds_out>; +- }; +- }; +- }; +- +- leds { +- compatible = "gpio-leds"; +- +- green { +- color = ; +- function = LED_FUNCTION_STATUS; +- gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>; +- }; +- +- blue { +- color = ; +- function = LED_FUNCTION_STATUS; +- gpios = <&gpio_ao GPIOAO_11 GPIO_ACTIVE_LOW>; +- linux,default-trigger = "heartbeat"; +- }; +- }; +- +- memory@0 { +- device_type = "memory"; +- reg = <0x0 0x0 0x0 0x40000000>; +- }; +- +- emmc_1v8: regulator-emmc_1v8 { +- compatible = "regulator-fixed"; +- regulator-name = "EMMC_1V8"; +- regulator-min-microvolt = <1800000>; +- regulator-max-microvolt = <1800000>; +- vin-supply = <&vddao_3v3>; +- regulator-always-on; +- }; +- +- dc_in: regulator-dc_in { +- compatible = "regulator-fixed"; +- regulator-name = "DC_IN"; +- regulator-min-microvolt = <5000000>; +- regulator-max-microvolt = <5000000>; +- regulator-always-on; +- }; +- +- vddio_c: regulator-vddio_c { +- compatible = "regulator-gpio"; +- regulator-name = "VDDIO_C"; +- regulator-min-microvolt = <1800000>; +- regulator-max-microvolt = <3300000>; +- +- enable-gpio = <&gpio GPIOE_2 GPIO_ACTIVE_HIGH>; +- enable-active-high; +- regulator-always-on; +- +- gpios = <&gpio_ao GPIOAO_6 GPIO_OPEN_DRAIN>; +- gpios-states = <1>; +- +- states = <1800000 0>, +- <3300000 1>; +- }; +- +- tflash_vdd: regulator-tflash_vdd { +- compatible = "regulator-fixed"; +- regulator-name = "TFLASH_VDD"; +- regulator-min-microvolt = <3300000>; +- regulator-max-microvolt = <3300000>; +- vin-supply = <&dc_in>; +- gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>; +- enable-active-high; +- regulator-always-on; +- }; +- +- vddao_1v8: regulator-vddao_1v8 { +- compatible = "regulator-fixed"; +- regulator-name = "VDDAO_1V8"; +- regulator-min-microvolt = <1800000>; +- regulator-max-microvolt = <1800000>; +- vin-supply = <&vddao_3v3>; +- regulator-always-on; +- }; +- +- vddao_3v3: regulator-vddao_3v3 { +- compatible = "regulator-fixed"; +- regulator-name = "VDDAO_3V3"; +- regulator-min-microvolt = <3300000>; +- regulator-max-microvolt = <3300000>; +- vin-supply = <&dc_in>; +- regulator-always-on; +- }; +- +- vddcpu: regulator-vddcpu { +- /* +- * SY8120B1ABC DC/DC Regulator. +- */ +- compatible = "pwm-regulator"; +- +- regulator-name = "VDDCPU"; +- regulator-min-microvolt = <690000>; +- regulator-max-microvolt = <1050000>; +- +- vin-supply = <&dc_in>; +- +- pwms = <&pwm_AO_cd 1 1250 0>; +- pwm-dutycycle-range = <100 0>; +- +- regulator-boot-on; +- regulator-always-on; +- }; +- +- /* USB Hub Power Enable */ +- vl_pwr_en: regulator-vl_pwr_en { +- compatible = "regulator-fixed"; +- regulator-name = "VL_PWR_EN"; +- regulator-min-microvolt = <5000000>; +- regulator-max-microvolt = <5000000>; +- vin-supply = <&dc_in>; +- +- gpio = <&gpio GPIOH_6 GPIO_ACTIVE_HIGH>; +- enable-active-high; +- }; +- + sound { + compatible = "amlogic,axg-sound-card"; + model = "BPI-M5"; +@@ -319,68 +150,17 @@ + status = "okay"; + }; + +-&arb { +- status = "okay"; +-}; + + &clkc_audio { + status = "okay"; + }; + +-&cpu0 { +- cpu-supply = <&vddcpu>; +- operating-points-v2 = <&cpu_opp_table>; +- clocks = <&clkc CLKID_CPU_CLK>; +- clock-latency = <50000>; +-}; +- +-&cpu1 { +- cpu-supply = <&vddcpu>; +- operating-points-v2 = <&cpu_opp_table>; +- clocks = <&clkc CLKID_CPU1_CLK>; +- clock-latency = <50000>; +-}; +- +-&cpu2 { +- cpu-supply = <&vddcpu>; +- operating-points-v2 = <&cpu_opp_table>; +- clocks = <&clkc CLKID_CPU2_CLK>; +- clock-latency = <50000>; +-}; +- +-&cpu3 { +- cpu-supply = <&vddcpu>; +- operating-points-v2 = <&cpu_opp_table>; +- clocks = <&clkc CLKID_CPU3_CLK>; +- clock-latency = <50000>; +-}; +- + &cvbs_vdac_port { + cvbs_vdac_out: endpoint { + remote-endpoint = <&cvbs_connector_in>; + }; + }; + +-&ext_mdio { +- external_phy: ethernet-phy@0 { +- /* Realtek RTL8211F (0x001cc916) */ +- reg = <0>; +- max-speed = <1000>; +- +- interrupt-parent = <&gpio_intc>; +- /* MAC_INTR on GPIOZ_14 */ +- interrupts = <26 IRQ_TYPE_LEVEL_LOW>; +- }; +-}; +- +-ðmac { +- pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; +- pinctrl-names = "default"; +- status = "okay"; +- phy-mode = "rgmii-txid"; +- phy-handle = <&external_phy>; +-}; +- + &frddr_a { + status = "okay"; + }; +@@ -393,191 +173,6 @@ + status = "okay"; + }; + +-&gpio { +- gpio-line-names = +- /* GPIOZ */ +- "ETH_MDIO", /* GPIOZ_0 */ +- "ETH_MDC", /* GPIOZ_1 */ +- "ETH_RXCLK", /* GPIOZ_2 */ +- "ETH_RX_DV", /* GPIOZ_3 */ +- "ETH_RXD0", /* GPIOZ_4 */ +- "ETH_RXD1", /* GPIOZ_5 */ +- "ETH_RXD2", /* GPIOZ_6 */ +- "ETH_RXD3", /* GPIOZ_7 */ +- "ETH_TXCLK", /* GPIOZ_8 */ +- "ETH_TXEN", /* GPIOZ_9 */ +- "ETH_TXD0", /* GPIOZ_10 */ +- "ETH_TXD1", /* GPIOZ_11 */ +- "ETH_TXD2", /* GPIOZ_12 */ +- "ETH_TXD3", /* GPIOZ_13 */ +- "ETH_INTR", /* GPIOZ_14 */ +- "ETH_NRST", /* GPIOZ_15 */ +- /* GPIOH */ +- "HDMI_SDA", /* GPIOH_0 */ +- "HDMI_SCL", /* GPIOH_1 */ +- "HDMI_HPD", /* GPIOH_2 */ +- "HDMI_CEC", /* GPIOH_3 */ +- "VL-RST_N", /* GPIOH_4 */ +- "CON1-P36", /* GPIOH_5 */ +- "VL-PWREN", /* GPIOH_6 */ +- "WiFi_3V3_1V8", /* GPIOH_7 */ +- "TFLASH_VDD_EN", /* GPIOH_8 */ +- /* BOOT */ +- "eMMC_D0", /* BOOT_0 */ +- "eMMC_D1", /* BOOT_1 */ +- "eMMC_D2", /* BOOT_2 */ +- "eMMC_D3", /* BOOT_3 */ +- "eMMC_D4", /* BOOT_4 */ +- "eMMC_D5", /* BOOT_5 */ +- "eMMC_D6", /* BOOT_6 */ +- "eMMC_D7", /* BOOT_7 */ +- "eMMC_CLK", /* BOOT_8 */ +- "", +- "eMMC_CMD", /* BOOT_10 */ +- "", +- "eMMC_RST#", /* BOOT_12 */ +- "eMMC_DS", /* BOOT_13 */ +- /* GPIOC */ +- "SD_D0_B", /* GPIOC_0 */ +- "SD_D1_B", /* GPIOC_1 */ +- "SD_D2_B", /* GPIOC_2 */ +- "SD_D3_B", /* GPIOC_3 */ +- "SD_CLK_B", /* GPIOC_4 */ +- "SD_CMD_B", /* GPIOC_5 */ +- "CARD_EN_DET", /* GPIOC_6 */ +- "", +- /* GPIOA */ +- "", "", "", "", "", "", "", "", +- "", "", "", "", "", "", +- "CON1-P27", /* GPIOA_14 */ +- "CON1-P28", /* GPIOA_15 */ +- /* GPIOX */ +- "CON1-P16", /* GPIOX_0 */ +- "CON1-P18", /* GPIOX_1 */ +- "CON1-P22", /* GPIOX_2 */ +- "CON1-P11", /* GPIOX_3 */ +- "CON1-P13", /* GPIOX_4 */ +- "CON1-P07", /* GPIOX_5 */ +- "CON1-P33", /* GPIOX_6 */ +- "CON1-P15", /* GPIOX_7 */ +- "CON1-P19", /* GPIOX_8 */ +- "CON1-P21", /* GPIOX_9 */ +- "CON1-P24", /* GPIOX_10 */ +- "CON1-P23", /* GPIOX_11 */ +- "CON1-P08", /* GPIOX_12 */ +- "CON1-P10", /* GPIOX_13 */ +- "CON1-P29", /* GPIOX_14 */ +- "CON1-P31", /* GPIOX_15 */ +- "CON1-P26", /* GPIOX_16 */ +- "CON1-P03", /* GPIOX_17 */ +- "CON1-P05", /* GPIOX_18 */ +- "CON1-P32"; /* GPIOX_19 */ +- +- /* +- * WARNING: The USB Hub on the BPI-M5 needs a reset signal +- * to be turned high in order to be detected by the USB Controller +- * This signal should be handled by a USB specific power sequence +- * in order to reset the Hub when USB bus is powered down. +- */ +- usb-hub { +- gpio-hog; +- gpios = ; +- output-high; +- line-name = "usb-hub-reset"; +- }; +-}; +- +-&gpio_ao { +- gpio-line-names = +- /* GPIOAO */ +- "DEBUG TX", /* GPIOAO_0 */ +- "DEBUG RX", /* GPIOAO_1 */ +- "SYS_LED2", /* GPIOAO_2 */ +- "UPDATE_KEY", /* GPIOAO_3 */ +- "CON1-P40", /* GPIOAO_4 */ +- "IR_IN", /* GPIOAO_5 */ +- "TF_3V3N_1V8_EN", /* GPIOAO_6 */ +- "CON1-P35", /* GPIOAO_7 */ +- "CON1-P12", /* GPIOAO_8 */ +- "CON1-P37", /* GPIOAO_9 */ +- "CON1-P38", /* GPIOAO_10 */ +- "SYS_LED", /* GPIOAO_11 */ +- /* GPIOE */ +- "VDDEE_PWM", /* GPIOE_0 */ +- "VDDCPU_PWM", /* GPIOE_1 */ +- "TF_PWR_EN"; /* GPIOE_2 */ +-}; +- +-&hdmi_tx { +- status = "okay"; +- pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>; +- pinctrl-names = "default"; +- hdmi-supply = <&dc_in>; +-}; +- +-&hdmi_tx_tmds_port { +- hdmi_tx_tmds_out: endpoint { +- remote-endpoint = <&hdmi_connector_in>; +- }; +-}; +- +-&ir { +- status = "okay"; +- pinctrl-0 = <&remote_input_ao_pins>; +- pinctrl-names = "default"; +-}; +- +-&pwm_AO_cd { +- pinctrl-0 = <&pwm_ao_d_e_pins>; +- pinctrl-names = "default"; +- clocks = <&xtal>; +- clock-names = "clkin1"; +- status = "okay"; +-}; +- +-&saradc { +- status = "okay"; +- vref-supply = <&vddao_1v8>; +-}; +- +-/* SD card */ +-&sd_emmc_b { +- status = "okay"; +- pinctrl-0 = <&sdcard_c_pins>; +- pinctrl-1 = <&sdcard_clk_gate_c_pins>; +- pinctrl-names = "default", "clk-gate"; +- +- bus-width = <4>; +- cap-sd-highspeed; +- max-frequency = <50000000>; +- disable-wp; +- +- /* TOFIX: SD card is barely usable in SDR modes */ +- +- cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>; +- vmmc-supply = <&tflash_vdd>; +- vqmmc-supply = <&vddio_c>; +-}; +- +-/* eMMC */ +-&sd_emmc_c { +- status = "okay"; +- pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_8b_pins>, <&emmc_ds_pins>; +- pinctrl-1 = <&emmc_clk_gate_pins>; +- pinctrl-names = "default", "clk-gate"; +- +- bus-width = <8>; +- cap-mmc-highspeed; +- mmc-ddr-1_8v; +- mmc-hs200-1_8v; +- max-frequency = <200000000>; +- disable-wp; +- +- mmc-pwrseq = <&emmc_pwrseq>; +- vmmc-supply = <&vddao_3v3>; +- vqmmc-supply = <&emmc_1v8>; +-}; +- + &tdmif_b { + status = "okay"; + }; +@@ -625,22 +220,3 @@ + &toddr_c { + status = "okay"; + }; +- +-&uart_AO { +- status = "okay"; +- pinctrl-0 = <&uart_ao_a_pins>; +- pinctrl-names = "default"; +-}; +- +-&usb { +- status = "okay"; +-}; +- +-&usb2_phy0 { +- phy-supply = <&dc_in>; +-}; +- +-&usb2_phy1 { +- /* Enable the hub which is connected to this port */ +- phy-supply = <&vl_pwr_en>; +-}; +diff --git a/arch/arm/dts/meson-sm1-bananapi.dtsi b/arch/arm/dts/meson-sm1-bananapi.dtsi +new file mode 100644 +index 0000000000..c914f11481 +--- /dev/null ++++ b/arch/arm/dts/meson-sm1-bananapi.dtsi +@@ -0,0 +1,435 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2021 BayLibre SAS ++ * Author: Neil Armstrong ++ */ ++ ++#include "meson-sm1.dtsi" ++#include ++#include ++#include ++ ++/ { ++ adc_keys { ++ compatible = "adc-keys"; ++ io-channels = <&saradc 2>; ++ io-channel-names = "buttons"; ++ keyup-threshold-microvolt = <1800000>; ++ ++ key { ++ label = "SW3"; ++ linux,code = ; ++ press-threshold-microvolt = <1700000>; ++ }; ++ }; ++ ++ aliases { ++ serial0 = &uart_AO; ++ ethernet0 = ðmac; ++ }; ++ ++ chosen { ++ stdout-path = "serial0:115200n8"; ++ }; ++ ++ emmc_pwrseq: emmc-pwrseq { ++ compatible = "mmc-pwrseq-emmc"; ++ reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; ++ }; ++ ++ gpio-keys { ++ compatible = "gpio-keys"; ++ ++ key { ++ label = "SW1"; ++ linux,code = ; ++ gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>; ++ interrupt-parent = <&gpio_intc>; ++ interrupts = <3 IRQ_TYPE_EDGE_BOTH>; ++ }; ++ }; ++ ++ hdmi-connector { ++ compatible = "hdmi-connector"; ++ type = "a"; ++ ++ port { ++ hdmi_connector_in: endpoint { ++ remote-endpoint = <&hdmi_tx_tmds_out>; ++ }; ++ }; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ led-green { ++ color = ; ++ function = LED_FUNCTION_STATUS; ++ gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>; ++ }; ++ ++ led-blue { ++ color = ; ++ function = LED_FUNCTION_STATUS; ++ gpios = <&gpio_ao GPIOAO_11 GPIO_ACTIVE_LOW>; ++ linux,default-trigger = "heartbeat"; ++ }; ++ }; ++ ++ memory@0 { ++ device_type = "memory"; ++ reg = <0x0 0x0 0x0 0x40000000>; ++ }; ++ ++ emmc_1v8: regulator-emmc_1v8 { ++ compatible = "regulator-fixed"; ++ regulator-name = "EMMC_1V8"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ vin-supply = <&vddao_3v3>; ++ regulator-always-on; ++ }; ++ ++ dc_in: regulator-dc_in { ++ compatible = "regulator-fixed"; ++ regulator-name = "DC_IN"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-always-on; ++ }; ++ ++ vddio_c: regulator-vddio_c { ++ compatible = "regulator-gpio"; ++ regulator-name = "VDDIO_C"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <3300000>; ++ ++ enable-gpio = <&gpio_ao GPIOE_2 GPIO_OPEN_DRAIN>; ++ enable-active-high; ++ regulator-always-on; ++ ++ gpios = <&gpio_ao GPIOAO_6 GPIO_OPEN_DRAIN>; ++ gpios-states = <1>; ++ ++ states = <1800000 0>, ++ <3300000 1>; ++ }; ++ ++ tflash_vdd: regulator-tflash_vdd { ++ compatible = "regulator-fixed"; ++ regulator-name = "TFLASH_VDD"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ vin-supply = <&dc_in>; ++ gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>; ++ enable-active-high; ++ regulator-always-on; ++ }; ++ ++ vddao_1v8: regulator-vddao_1v8 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VDDAO_1V8"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ vin-supply = <&vddao_3v3>; ++ regulator-always-on; ++ }; ++ ++ vddao_3v3: regulator-vddao_3v3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VDDAO_3V3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ vin-supply = <&dc_in>; ++ regulator-always-on; ++ }; ++ ++ vddcpu: regulator-vddcpu { ++ /* ++ * SY8120B1ABC DC/DC Regulator. ++ */ ++ compatible = "pwm-regulator"; ++ ++ regulator-name = "VDDCPU"; ++ regulator-min-microvolt = <690000>; ++ regulator-max-microvolt = <1050000>; ++ ++ pwm-supply = <&dc_in>; ++ ++ pwms = <&pwm_AO_cd 1 1250 0>; ++ pwm-dutycycle-range = <100 0>; ++ ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ++ /* USB Hub Power Enable */ ++ vl_pwr_en: regulator-vl_pwr_en { ++ compatible = "regulator-fixed"; ++ regulator-name = "VL_PWR_EN"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ vin-supply = <&dc_in>; ++ ++ gpio = <&gpio GPIOH_6 GPIO_ACTIVE_HIGH>; ++ enable-active-high; ++ }; ++}; ++ ++&arb { ++ status = "okay"; ++}; ++ ++&cpu0 { ++ cpu-supply = <&vddcpu>; ++ operating-points-v2 = <&cpu_opp_table>; ++ clocks = <&clkc CLKID_CPU_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu1 { ++ cpu-supply = <&vddcpu>; ++ operating-points-v2 = <&cpu_opp_table>; ++ clocks = <&clkc CLKID_CPU1_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu2 { ++ cpu-supply = <&vddcpu>; ++ operating-points-v2 = <&cpu_opp_table>; ++ clocks = <&clkc CLKID_CPU2_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu3 { ++ cpu-supply = <&vddcpu>; ++ operating-points-v2 = <&cpu_opp_table>; ++ clocks = <&clkc CLKID_CPU3_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&ext_mdio { ++ external_phy: ethernet-phy@0 { ++ /* Realtek RTL8211F (0x001cc916) */ ++ reg = <0>; ++ max-speed = <1000>; ++ ++ interrupt-parent = <&gpio_intc>; ++ /* MAC_INTR on GPIOZ_14 */ ++ interrupts = <26 IRQ_TYPE_LEVEL_LOW>; ++ }; ++}; ++ ++ðmac { ++ pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; ++ pinctrl-names = "default"; ++ status = "okay"; ++ phy-mode = "rgmii-txid"; ++ phy-handle = <&external_phy>; ++}; ++ ++&gpio { ++ gpio-line-names = ++ /* GPIOZ */ ++ "ETH_MDIO", /* GPIOZ_0 */ ++ "ETH_MDC", /* GPIOZ_1 */ ++ "ETH_RXCLK", /* GPIOZ_2 */ ++ "ETH_RX_DV", /* GPIOZ_3 */ ++ "ETH_RXD0", /* GPIOZ_4 */ ++ "ETH_RXD1", /* GPIOZ_5 */ ++ "ETH_RXD2", /* GPIOZ_6 */ ++ "ETH_RXD3", /* GPIOZ_7 */ ++ "ETH_TXCLK", /* GPIOZ_8 */ ++ "ETH_TXEN", /* GPIOZ_9 */ ++ "ETH_TXD0", /* GPIOZ_10 */ ++ "ETH_TXD1", /* GPIOZ_11 */ ++ "ETH_TXD2", /* GPIOZ_12 */ ++ "ETH_TXD3", /* GPIOZ_13 */ ++ "ETH_INTR", /* GPIOZ_14 */ ++ "ETH_NRST", /* GPIOZ_15 */ ++ /* GPIOH */ ++ "HDMI_SDA", /* GPIOH_0 */ ++ "HDMI_SCL", /* GPIOH_1 */ ++ "HDMI_HPD", /* GPIOH_2 */ ++ "HDMI_CEC", /* GPIOH_3 */ ++ "VL-RST_N", /* GPIOH_4 */ ++ "CON1-P36", /* GPIOH_5 */ ++ "VL-PWREN", /* GPIOH_6 */ ++ "WiFi_3V3_1V8", /* GPIOH_7 */ ++ "TFLASH_VDD_EN", /* GPIOH_8 */ ++ /* BOOT */ ++ "eMMC_D0", /* BOOT_0 */ ++ "eMMC_D1", /* BOOT_1 */ ++ "eMMC_D2", /* BOOT_2 */ ++ "eMMC_D3", /* BOOT_3 */ ++ "eMMC_D4", /* BOOT_4 */ ++ "eMMC_D5", /* BOOT_5 */ ++ "eMMC_D6", /* BOOT_6 */ ++ "eMMC_D7", /* BOOT_7 */ ++ "eMMC_CLK", /* BOOT_8 */ ++ "", ++ "eMMC_CMD", /* BOOT_10 */ ++ "", ++ "eMMC_RST#", /* BOOT_12 */ ++ "eMMC_DS", /* BOOT_13 */ ++ "", "", ++ /* GPIOC */ ++ "SD_D0_B", /* GPIOC_0 */ ++ "SD_D1_B", /* GPIOC_1 */ ++ "SD_D2_B", /* GPIOC_2 */ ++ "SD_D3_B", /* GPIOC_3 */ ++ "SD_CLK_B", /* GPIOC_4 */ ++ "SD_CMD_B", /* GPIOC_5 */ ++ "CARD_EN_DET", /* GPIOC_6 */ ++ "", ++ /* GPIOA */ ++ "", "", "", "", "", "", "", "", ++ "", "", "", "", "", "", ++ "CON1-P27", /* GPIOA_14 */ ++ "CON1-P28", /* GPIOA_15 */ ++ /* GPIOX */ ++ "CON1-P16", /* GPIOX_0 */ ++ "CON1-P18", /* GPIOX_1 */ ++ "CON1-P22", /* GPIOX_2 */ ++ "CON1-P11", /* GPIOX_3 */ ++ "CON1-P13", /* GPIOX_4 */ ++ "CON1-P07", /* GPIOX_5 */ ++ "CON1-P33", /* GPIOX_6 */ ++ "CON1-P15", /* GPIOX_7 */ ++ "CON1-P19", /* GPIOX_8 */ ++ "CON1-P21", /* GPIOX_9 */ ++ "CON1-P24", /* GPIOX_10 */ ++ "CON1-P23", /* GPIOX_11 */ ++ "CON1-P08", /* GPIOX_12 */ ++ "CON1-P10", /* GPIOX_13 */ ++ "CON1-P29", /* GPIOX_14 */ ++ "CON1-P31", /* GPIOX_15 */ ++ "CON1-P26", /* GPIOX_16 */ ++ "CON1-P03", /* GPIOX_17 */ ++ "CON1-P05", /* GPIOX_18 */ ++ "CON1-P32"; /* GPIOX_19 */ ++ ++ /* ++ * WARNING: The USB Hub needs a reset signal to be turned high in ++ * order to be detected by the USB Controller. This signal should ++ * be handled by a USB specific power sequence to reset the Hub ++ * when the USB bus is powered down. ++ */ ++ usb-hub { ++ gpio-hog; ++ gpios = ; ++ output-high; ++ line-name = "usb-hub-reset"; ++ }; ++}; ++ ++&gpio_ao { ++ gpio-line-names = ++ /* GPIOAO */ ++ "DEBUG TX", /* GPIOAO_0 */ ++ "DEBUG RX", /* GPIOAO_1 */ ++ "SYS_LED2", /* GPIOAO_2 */ ++ "UPDATE_KEY", /* GPIOAO_3 */ ++ "CON1-P40", /* GPIOAO_4 */ ++ "IR_IN", /* GPIOAO_5 */ ++ "TF_3V3N_1V8_EN", /* GPIOAO_6 */ ++ "CON1-P35", /* GPIOAO_7 */ ++ "CON1-P12", /* GPIOAO_8 */ ++ "CON1-P37", /* GPIOAO_9 */ ++ "CON1-P38", /* GPIOAO_10 */ ++ "SYS_LED", /* GPIOAO_11 */ ++ /* GPIOE */ ++ "VDDEE_PWM", /* GPIOE_0 */ ++ "VDDCPU_PWM", /* GPIOE_1 */ ++ "TF_PWR_EN"; /* GPIOE_2 */ ++}; ++ ++&hdmi_tx { ++ status = "okay"; ++ pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>; ++ pinctrl-names = "default"; ++ hdmi-supply = <&dc_in>; ++}; ++ ++&hdmi_tx_tmds_port { ++ hdmi_tx_tmds_out: endpoint { ++ remote-endpoint = <&hdmi_connector_in>; ++ }; ++}; ++ ++&ir { ++ status = "okay"; ++ pinctrl-0 = <&remote_input_ao_pins>; ++ pinctrl-names = "default"; ++}; ++ ++&pwm_AO_cd { ++ pinctrl-0 = <&pwm_ao_d_e_pins>; ++ pinctrl-names = "default"; ++ clocks = <&xtal>; ++ clock-names = "clkin1"; ++ status = "okay"; ++}; ++ ++&saradc { ++ status = "okay"; ++ vref-supply = <&vddao_1v8>; ++}; ++ ++/* SD card */ ++&sd_emmc_b { ++ status = "okay"; ++ pinctrl-0 = <&sdcard_c_pins>; ++ pinctrl-1 = <&sdcard_clk_gate_c_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ ++ bus-width = <4>; ++ cap-sd-highspeed; ++ max-frequency = <50000000>; ++ disable-wp; ++ ++ /* TOFIX: SD card is barely usable in SDR modes */ ++ ++ cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>; ++ vmmc-supply = <&tflash_vdd>; ++ vqmmc-supply = <&vddio_c>; ++}; ++ ++/* eMMC */ ++&sd_emmc_c { ++ status = "okay"; ++ pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_8b_pins>, <&emmc_ds_pins>; ++ pinctrl-1 = <&emmc_clk_gate_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ ++ bus-width = <8>; ++ cap-mmc-highspeed; ++ mmc-ddr-1_8v; ++ mmc-hs200-1_8v; ++ max-frequency = <200000000>; ++ disable-wp; ++ ++ mmc-pwrseq = <&emmc_pwrseq>; ++ vmmc-supply = <&vddao_3v3>; ++ vqmmc-supply = <&emmc_1v8>; ++}; ++ ++&uart_AO { ++ status = "okay"; ++ pinctrl-0 = <&uart_ao_a_pins>; ++ pinctrl-names = "default"; ++}; ++ ++&usb { ++ status = "okay"; ++}; ++ ++&usb2_phy0 { ++ phy-supply = <&dc_in>; ++}; ++ ++&usb2_phy1 { ++ /* Enable the hub which is connected to this port */ ++ phy-supply = <&vl_pwr_en>; ++}; +-- +2.34.1 + diff --git a/projects/Amlogic/patches/u-boot/u-boot-0017-WIP-ARM-dts-add-support-for-BananaPi-M2-Pro.patch b/projects/Amlogic/patches/u-boot/u-boot-0017-WIP-ARM-dts-add-support-for-BananaPi-M2-Pro.patch new file mode 100644 index 0000000000..aa2db89932 --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0017-WIP-ARM-dts-add-support-for-BananaPi-M2-Pro.patch @@ -0,0 +1,152 @@ +From dbf80e3d843cb58b9098d7c0e24c9ab1208003a7 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Fri, 17 Feb 2023 05:38:46 +0000 +Subject: [PATCH 17/22] WIP: ARM: dts: add support for BananaPi M2-Pro + +Signed-off-by: Christian Hewitt +--- + arch/arm/dts/Makefile | 1 + + .../dts/meson-sm1-bananapi-m2-pro-u-boot.dtsi | 13 +++ + arch/arm/dts/meson-sm1-bananapi-m2-pro.dts | 98 +++++++++++++++++++ + 3 files changed, 112 insertions(+) + create mode 100644 arch/arm/dts/meson-sm1-bananapi-m2-pro-u-boot.dtsi + create mode 100644 arch/arm/dts/meson-sm1-bananapi-m2-pro.dts + +diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile +index 926ae0aae4..4e9fa81e18 100644 +--- a/arch/arm/dts/Makefile ++++ b/arch/arm/dts/Makefile +@@ -203,6 +203,7 @@ dtb-$(CONFIG_ARCH_MESON) += \ + meson-g12b-odroid-n2.dtb \ + meson-g12b-odroid-n2-plus.dtb \ + meson-g12b-radxa-zero2.dtb \ ++ meson-sm1-bananapi-m2-pro.dtb \ + meson-sm1-bananapi-m5.dtb \ + meson-sm1-khadas-vim3l.dtb \ + meson-sm1-odroid-c4.dtb \ +diff --git a/arch/arm/dts/meson-sm1-bananapi-m2-pro-u-boot.dtsi b/arch/arm/dts/meson-sm1-bananapi-m2-pro-u-boot.dtsi +new file mode 100644 +index 0000000000..a86fdb5668 +--- /dev/null ++++ b/arch/arm/dts/meson-sm1-bananapi-m2-pro-u-boot.dtsi +@@ -0,0 +1,13 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2021 BayLibre, SAS ++ * Author: Neil Armstrong ++ */ ++ ++#include "meson-sm1-u-boot.dtsi" ++ ++ðmac { ++ snps,reset-gpio = <&gpio GPIOZ_15 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>; ++ snps,reset-delays-us = <0 10000 1000000>; ++ snps,reset-active-low; ++}; +diff --git a/arch/arm/dts/meson-sm1-bananapi-m2-pro.dts b/arch/arm/dts/meson-sm1-bananapi-m2-pro.dts +new file mode 100644 +index 0000000000..4890d5d9a4 +--- /dev/null ++++ b/arch/arm/dts/meson-sm1-bananapi-m2-pro.dts +@@ -0,0 +1,98 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2021 BayLibre SAS ++ * Author: Neil Armstrong ++ */ ++ ++/dts-v1/; ++ ++#include "meson-sm1-bananapi.dtsi" ++#include ++ ++/ { ++ compatible = "bananapi,bpi-m2-pro", "amlogic,sm1"; ++ model = "Banana Pi BPI-M2-PRO"; ++ ++ sound { ++ compatible = "amlogic,axg-sound-card"; ++ model = "BPI-M2-PRO"; ++ audio-aux-devs = <&tdmout_b>; ++ audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1", ++ "TDMOUT_B IN 1", "FRDDR_B OUT 1", ++ "TDMOUT_B IN 2", "FRDDR_C OUT 1", ++ "TDM_B Playback", "TDMOUT_B OUT"; ++ ++ assigned-clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ assigned-clock-parents = <0>, <0>, <0>; ++ assigned-clock-rates = <294912000>, ++ <270950400>, ++ <393216000>; ++ status = "okay"; ++ ++ dai-link-0 { ++ sound-dai = <&frddr_a>; ++ }; ++ ++ dai-link-1 { ++ sound-dai = <&frddr_b>; ++ }; ++ ++ dai-link-2 { ++ sound-dai = <&frddr_c>; ++ }; ++ ++ /* 8ch hdmi interface */ ++ dai-link-3 { ++ sound-dai = <&tdmif_b>; ++ dai-format = "i2s"; ++ dai-tdm-slot-tx-mask-0 = <1 1>; ++ dai-tdm-slot-tx-mask-1 = <1 1>; ++ dai-tdm-slot-tx-mask-2 = <1 1>; ++ dai-tdm-slot-tx-mask-3 = <1 1>; ++ mclk-fs = <256>; ++ ++ codec { ++ sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>; ++ }; ++ }; ++ ++ /* hdmi glue */ ++ dai-link-4 { ++ sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>; ++ ++ codec { ++ sound-dai = <&hdmi_tx>; ++ }; ++ }; ++ }; ++}; ++ ++&clkc_audio { ++ status = "okay"; ++}; ++ ++&frddr_a { ++ status = "okay"; ++}; ++ ++&frddr_b { ++ status = "okay"; ++}; ++ ++&frddr_c { ++ status = "okay"; ++}; ++ ++&tdmif_b { ++ status = "okay"; ++}; ++ ++&tdmout_b { ++ status = "okay"; ++}; ++ ++&tohdmitx { ++ status = "okay"; ++}; +-- +2.34.1 + diff --git a/projects/Amlogic/patches/u-boot/u-boot-0018-WIP-boards-add-BananaPi-M2-Pro-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0018-WIP-boards-add-BananaPi-M2-Pro-defconfig.patch new file mode 100644 index 0000000000..e17be8f0c5 --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0018-WIP-boards-add-BananaPi-M2-Pro-defconfig.patch @@ -0,0 +1,96 @@ +From 0be895d75648124c0bd8d7fce1fe61c3dbacbe5f Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Fri, 17 Feb 2023 05:41:36 +0000 +Subject: [PATCH 18/22] WIP: boards: add BananaPi M2-Pro defconfig + +Signed-off-by: Christian Hewitt +--- + configs/bananapi-m2-pro_defconfig | 76 +++++++++++++++++++++++++++++++ + 1 file changed, 76 insertions(+) + create mode 100644 configs/bananapi-m2-pro_defconfig + +diff --git a/configs/bananapi-m2-pro_defconfig b/configs/bananapi-m2-pro_defconfig +new file mode 100644 +index 0000000000..1c2b8ab95e +--- /dev/null ++++ b/configs/bananapi-m2-pro_defconfig +@@ -0,0 +1,76 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_MESON=y ++CONFIG_SYS_TEXT_BASE=0x01000000 ++CONFIG_NR_DRAM_BANKS=1 ++CONFIG_ENV_SIZE=0x2000 ++CONFIG_DM_GPIO=y ++CONFIG_DEFAULT_DEVICE_TREE="meson-sm1-bananapi-m2-pro" ++CONFIG_MESON_G12A=y ++CONFIG_DEBUG_UART_BASE=0xff803000 ++CONFIG_DEBUG_UART_CLOCK=24000000 ++CONFIG_IDENT_STRING="bpi-m2-pro" ++CONFIG_SYS_LOAD_ADDR=0x1000000 ++CONFIG_DEBUG_UART=y ++CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y ++CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 ++CONFIG_REMAKE_ELF=y ++CONFIG_OF_BOARD_SETUP=y ++# CONFIG_DISPLAY_CPUINFO is not set ++CONFIG_MISC_INIT_R=y ++CONFIG_SYS_MAXARGS=32 ++# CONFIG_CMD_BDI is not set ++# CONFIG_CMD_IMI is not set ++CONFIG_CMD_GPIO=y ++# CONFIG_CMD_LOADS is not set ++CONFIG_CMD_MMC=y ++CONFIG_CMD_USB=y ++CONFIG_CMD_USB_MASS_STORAGE=y ++# CONFIG_CMD_SETEXPR is not set ++CONFIG_CMD_REGULATOR=y ++CONFIG_OF_CONTROL=y ++CONFIG_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_ADC=y ++CONFIG_SARADC_MESON=y ++CONFIG_MMC_MESON_GX=y ++CONFIG_PHY_REALTEK=y ++CONFIG_DM_MDIO=y ++CONFIG_DM_MDIO_MUX=y ++CONFIG_ETH_DESIGNWARE_MESON8B=y ++CONFIG_MDIO_MUX_MESON_G12A=y ++CONFIG_MESON_G12A_USB_PHY=y ++CONFIG_PINCTRL=y ++CONFIG_PINCTRL_MESON_G12A=y ++CONFIG_POWER_DOMAIN=y ++CONFIG_MESON_EE_POWER_DOMAIN=y ++CONFIG_DM_REGULATOR=y ++CONFIG_DM_REGULATOR_FIXED=y ++CONFIG_DM_RESET=y ++CONFIG_DEBUG_UART_ANNOUNCE=y ++CONFIG_DEBUG_UART_SKIP_INIT=y ++CONFIG_MESON_SERIAL=y ++CONFIG_USB=y ++CONFIG_USB_XHCI_HCD=y ++CONFIG_USB_XHCI_DWC3=y ++CONFIG_USB_DWC3=y ++# CONFIG_USB_DWC3_GADGET is not set ++CONFIG_USB_DWC3_MESON_G12A=y ++CONFIG_USB_KEYBOARD=y ++CONFIG_USB_GADGET=y ++CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e ++CONFIG_USB_GADGET_PRODUCT_NUM=0xfada ++CONFIG_USB_GADGET_DWC2_OTG=y ++CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y ++CONFIG_USB_GADGET_DOWNLOAD=y ++CONFIG_DM_VIDEO=y ++# CONFIG_VIDEO_BPP8 is not set ++# CONFIG_VIDEO_BPP16 is not set ++CONFIG_SYS_WHITE_ON_BLACK=y ++CONFIG_VIDEO_MESON=y ++CONFIG_VIDEO_DT_SIMPLEFB=y ++CONFIG_SPLASH_SCREEN=y ++CONFIG_SPLASH_SCREEN_ALIGN=y ++CONFIG_VIDEO_BMP_RLE8=y ++CONFIG_BMP_16BPP=y ++CONFIG_BMP_24BPP=y ++CONFIG_BMP_32BPP=y ++CONFIG_OF_LIBFDT_OVERLAY=y +-- +2.34.1 + diff --git a/projects/Amlogic/patches/u-boot/u-boot-0019-WIP-docs-boards-amlogic-update-for-BananaPi-M2-Pro.patch b/projects/Amlogic/patches/u-boot/u-boot-0019-WIP-docs-boards-amlogic-update-for-BananaPi-M2-Pro.patch new file mode 100644 index 0000000000..03ad4f5c60 --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0019-WIP-docs-boards-amlogic-update-for-BananaPi-M2-Pro.patch @@ -0,0 +1,49 @@ +From b4870c47202687c6a6880b449c97a2e32ec3d278 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Fri, 17 Feb 2023 05:49:44 +0000 +Subject: [PATCH 19/22] WIP: docs: boards: amlogic: update for BananaPi M2-Pro + +Signed-off-by: Christian Hewitt +--- + board/amlogic/u200/MAINTAINERS | 1 + + doc/board/amlogic/index.rst | 5 +++-- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/board/amlogic/u200/MAINTAINERS b/board/amlogic/u200/MAINTAINERS +index 47cec234a1..2a2d9d4c49 100644 +--- a/board/amlogic/u200/MAINTAINERS ++++ b/board/amlogic/u200/MAINTAINERS +@@ -4,6 +4,7 @@ S: Maintained + L: u-boot-amlogic@groups.io + F: board/amlogic/u200/ + F: configs/u200_defconfig ++F: configs/bananapi-m2-pro_defconfig + F: configs/bananapi-m5_defconfig + F: configs/radxa-zero_defconfig + F: doc/board/amlogic/u200.rst +diff --git a/doc/board/amlogic/index.rst b/doc/board/amlogic/index.rst +index b8b6f9b98a..629284fca9 100644 +--- a/doc/board/amlogic/index.rst ++++ b/doc/board/amlogic/index.rst +@@ -19,7 +19,8 @@ This matrix concerns the actual source code version. + | | Nanopi-K2 | Khadas-VIM | Khadas VIM2 | JetHub J100 | SEI510 | Khadas-VIM3 | Khadas-VIM3L | + | | P200 | LibreTech-CC v1 | Libretech-PC | | Radxa Zero | GT-King/Pro | Odroid-C4 | + | | P201 | LibreTech-AC v2 | WeTek Core2 | | | GSKing-X | Odroid-HC4 | +-| | | JetHub J80 | | | | Radxa Zero2 | BananaPi-M5 | ++| | | JetHub J80 | | | | Radxa Zero2 | BPi-M2-Pro | ++| | | | | | | Radxa Zero2 | BPi-M5 | + +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ + | UART | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | + +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ +@@ -37,7 +38,7 @@ This matrix concerns the actual source code version. + +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ + | Multi-core | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | + +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ +-| Fuse access | **Yes** | **Yes** |**Yes** |**Yes** |**Yes** |**Yes** | **Yes** | ++| Fuse access | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | + +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ + | SPI (FC) | **Yes** | **Yes** | **Yes** | **Yes** |**Yes** | **Yes** | No | + +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ +-- +2.34.1 + diff --git a/projects/Amlogic/patches/u-boot/u-boot-0020-WIP-boards-add-BananaPi-M2S-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0020-WIP-boards-add-BananaPi-M2S-defconfig.patch new file mode 100644 index 0000000000..82df4f88b2 --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0020-WIP-boards-add-BananaPi-M2S-defconfig.patch @@ -0,0 +1,102 @@ +From 665eff902425685a2278e393a89452276e4ea665 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Sat, 18 Feb 2023 08:06:04 +0000 +Subject: [PATCH 20/22] WIP: boards: add BananaPi M2S defconfig + +Signed-off-by: Christian Hewitt +--- + configs/bananapi-m2s_defconfig | 82 ++++++++++++++++++++++++++++++++++ + 1 file changed, 82 insertions(+) + create mode 100644 configs/bananapi-m2s_defconfig + +diff --git a/configs/bananapi-m2s_defconfig b/configs/bananapi-m2s_defconfig +new file mode 100644 +index 0000000000..7a35ea623d +--- /dev/null ++++ b/configs/bananapi-m2s_defconfig +@@ -0,0 +1,82 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_MESON=y ++CONFIG_SYS_TEXT_BASE=0x01000000 ++CONFIG_NR_DRAM_BANKS=1 ++CONFIG_ENV_SIZE=0x2000 ++CONFIG_DM_GPIO=y ++CONFIG_DEFAULT_DEVICE_TREE="meson-g12b-a311d-bananapi-m2s" ++CONFIG_MESON_G12A=y ++CONFIG_DEBUG_UART_BASE=0xff803000 ++CONFIG_DEBUG_UART_CLOCK=24000000 ++CONFIG_IDENT_STRING=" bpi-m2s" ++CONFIG_SYS_LOAD_ADDR=0x1000000 ++CONFIG_DEBUG_UART=y ++CONFIG_AHCI=y ++CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y ++CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 ++CONFIG_REMAKE_ELF=y ++CONFIG_OF_BOARD_SETUP=y ++# CONFIG_DISPLAY_CPUINFO is not set ++CONFIG_MISC_INIT_R=y ++CONFIG_SYS_MAXARGS=32 ++# CONFIG_CMD_BDI is not set ++# CONFIG_CMD_IMI is not set ++CONFIG_CMD_GPIO=y ++# CONFIG_CMD_LOADS is not set ++CONFIG_CMD_MMC=y ++CONFIG_CMD_PCI=y ++CONFIG_CMD_USB=y ++CONFIG_CMD_USB_MASS_STORAGE=y ++# CONFIG_CMD_SETEXPR is not set ++CONFIG_CMD_REGULATOR=y ++CONFIG_OF_CONTROL=y ++CONFIG_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_ADC=y ++CONFIG_SARADC_MESON=y ++CONFIG_AHCI_PCI=y ++CONFIG_MMC_MESON_GX=y ++CONFIG_PHY_REALTEK=y ++CONFIG_DM_MDIO=y ++CONFIG_DM_MDIO_MUX=y ++CONFIG_ETH_DESIGNWARE_MESON8B=y ++CONFIG_MDIO_MUX_MESON_G12A=y ++CONFIG_PCI=y ++CONFIG_PCIE_DW_MESON=y ++CONFIG_MESON_G12A_USB_PHY=y ++CONFIG_PINCTRL=y ++CONFIG_PINCTRL_MESON_G12A=y ++CONFIG_POWER_DOMAIN=y ++CONFIG_MESON_EE_POWER_DOMAIN=y ++CONFIG_DM_REGULATOR=y ++CONFIG_DM_REGULATOR_FIXED=y ++CONFIG_DM_REGULATOR_GPIO=y ++CONFIG_DM_RESET=y ++CONFIG_DEBUG_UART_ANNOUNCE=y ++CONFIG_DEBUG_UART_SKIP_INIT=y ++CONFIG_MESON_SERIAL=y ++CONFIG_USB=y ++CONFIG_USB_XHCI_HCD=y ++CONFIG_USB_XHCI_DWC3=y ++CONFIG_USB_DWC3=y ++# CONFIG_USB_DWC3_GADGET is not set ++CONFIG_USB_DWC3_MESON_G12A=y ++CONFIG_USB_KEYBOARD=y ++CONFIG_USB_GADGET=y ++CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e ++CONFIG_USB_GADGET_PRODUCT_NUM=0xfada ++CONFIG_USB_GADGET_DWC2_OTG=y ++CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y ++CONFIG_USB_GADGET_DOWNLOAD=y ++CONFIG_DM_VIDEO=y ++# CONFIG_VIDEO_BPP8 is not set ++# CONFIG_VIDEO_BPP16 is not set ++CONFIG_SYS_WHITE_ON_BLACK=y ++CONFIG_VIDEO_MESON=y ++CONFIG_VIDEO_DT_SIMPLEFB=y ++CONFIG_SPLASH_SCREEN=y ++CONFIG_SPLASH_SCREEN_ALIGN=y ++CONFIG_VIDEO_BMP_RLE8=y ++CONFIG_BMP_16BPP=y ++CONFIG_BMP_24BPP=y ++CONFIG_BMP_32BPP=y ++CONFIG_OF_LIBFDT_OVERLAY=y +-- +2.34.1 + diff --git a/projects/Amlogic/patches/u-boot/u-boot-0021-WIP-docs-boards-amlogic-update-for-BananaPi-M2S.patch b/projects/Amlogic/patches/u-boot/u-boot-0021-WIP-docs-boards-amlogic-update-for-BananaPi-M2S.patch new file mode 100644 index 0000000000..68e1d2aa95 --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0021-WIP-docs-boards-amlogic-update-for-BananaPi-M2S.patch @@ -0,0 +1,40 @@ +From e1484036ca5e032a9039ed2f361f2b123a8efd64 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Sat, 18 Feb 2023 08:08:42 +0000 +Subject: [PATCH 21/22] WIP: docs: boards: amlogic: update for BananaPi M2S + +Signed-off-by: Christian Hewitt +--- + board/amlogic/w400/MAINTAINERS | 2 ++ + doc/board/amlogic/index.rst | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/board/amlogic/w400/MAINTAINERS b/board/amlogic/w400/MAINTAINERS +index 6e1ef9b8b8..d4b4d4f91d 100644 +--- a/board/amlogic/w400/MAINTAINERS ++++ b/board/amlogic/w400/MAINTAINERS +@@ -3,6 +3,8 @@ M: Neil Armstrong + S: Maintained + L: u-boot-amlogic@groups.io + F: board/amlogic/w400/ ++F: configs/bananapi-m2s_defconfig + F: configs/radxa-zero2_defconfig + F: doc/board/amlogic/w400.rst ++F: doc/board/amlogic/bananapi-m2s.rst + F: doc/board/amlogic/radxa-zero2.rst +diff --git a/doc/board/amlogic/index.rst b/doc/board/amlogic/index.rst +index 629284fca9..fd8d4185f8 100644 +--- a/doc/board/amlogic/index.rst ++++ b/doc/board/amlogic/index.rst +@@ -20,7 +20,7 @@ This matrix concerns the actual source code version. + | | P200 | LibreTech-CC v1 | Libretech-PC | | Radxa Zero | GT-King/Pro | Odroid-C4 | + | | P201 | LibreTech-AC v2 | WeTek Core2 | | | GSKing-X | Odroid-HC4 | + | | | JetHub J80 | | | | Radxa Zero2 | BPi-M2-Pro | +-| | | | | | | Radxa Zero2 | BPi-M5 | ++| | | | | | | BPI-M2S | BPi-M5 | + +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ + | UART | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | + +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ +-- +2.34.1 + diff --git a/projects/Amlogic/patches/u-boot/u-boot-0022-WIP-ARM-dts-add-support-for-BananaPi-M2S.patch b/projects/Amlogic/patches/u-boot/u-boot-0022-WIP-ARM-dts-add-support-for-BananaPi-M2S.patch new file mode 100644 index 0000000000..fe9a7d6e12 --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0022-WIP-ARM-dts-add-support-for-BananaPi-M2S.patch @@ -0,0 +1,651 @@ +From 821819ff0d9185954b251d5fd197b5b67cdd08d3 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Sat, 18 Feb 2023 07:59:25 +0000 +Subject: [PATCH 22/22] WIP: ARM: dts: add support for BananaPi M2S + +Import the device-tree from Linux 6.x + +Signed-off-by: Christian Hewitt +--- + arch/arm/dts/Makefile | 1 + + .../arm/dts/meson-g12b-a311d-bananapi-m2s.dts | 14 + + arch/arm/dts/meson-g12b-bananapi-u-boot.dtsi | 13 + + arch/arm/dts/meson-g12b-bananapi.dtsi | 551 ++++++++++++++++++ + .../arm/dts/meson-g12b-s922x-bananapi-m2s.dts | 14 + + 5 files changed, 593 insertions(+) + create mode 100644 arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts + create mode 100644 arch/arm/dts/meson-g12b-bananapi-u-boot.dtsi + create mode 100644 arch/arm/dts/meson-g12b-bananapi.dtsi + create mode 100644 arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts + +diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile +index 4e9fa81e18..788fec93a3 100644 +--- a/arch/arm/dts/Makefile ++++ b/arch/arm/dts/Makefile +@@ -196,6 +196,7 @@ dtb-$(CONFIG_ARCH_MESON) += \ + meson-g12a-radxa-zero.dtb \ + meson-g12a-sei510.dtb \ + meson-g12a-u200.dtb \ ++ meson-g12b-a311d-bananapi-m2s.dtb \ + meson-g12b-a311d-khadas-vim3.dtb \ + meson-g12b-gtking.dtb \ + meson-g12b-gtking-pro.dtb \ +diff --git a/arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts b/arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts +new file mode 100644 +index 0000000000..f6c950919b +--- /dev/null ++++ b/arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts +@@ -0,0 +1,14 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2023 Christian Hewitt ++ */ ++ ++/dts-v1/; ++ ++#include "meson-g12b-a311d.dtsi" ++#include "meson-g12b-bananapi.dtsi" ++ ++/ { ++ compatible = "bananapi,bpi-m2s", "amlogic,a311d", "amlogic,g12b"; ++ model = "BananaPi M2S"; ++}; +diff --git a/arch/arm/dts/meson-g12b-bananapi-u-boot.dtsi b/arch/arm/dts/meson-g12b-bananapi-u-boot.dtsi +new file mode 100644 +index 0000000000..a92f9e9ff1 +--- /dev/null ++++ b/arch/arm/dts/meson-g12b-bananapi-u-boot.dtsi +@@ -0,0 +1,13 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2019 BayLibre, SAS. ++ * Author: Neil Armstrong ++ */ ++ ++#include "meson-g12-common-u-boot.dtsi" ++ ++/* SARADC is needed for proper board variant detection */ ++&saradc { ++ status = "okay"; ++ vref-supply = <&vddao_1v8>; ++}; +diff --git a/arch/arm/dts/meson-g12b-bananapi.dtsi b/arch/arm/dts/meson-g12b-bananapi.dtsi +new file mode 100644 +index 0000000000..3a9f36ad4e +--- /dev/null ++++ b/arch/arm/dts/meson-g12b-bananapi.dtsi +@@ -0,0 +1,551 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2023 Christian Hewitt ++ */ ++ ++#include ++#include ++#include ++#include ++ ++/ { ++ aliases { ++ serial0 = &uart_AO; ++ serial2 = &uart_A; ++ ethernet0 = ðmac; ++ }; ++ ++ chosen { ++ stdout-path = "serial0:115200n8"; ++ }; ++ ++ memory@0 { ++ device_type = "memory"; ++ reg = <0x0 0x0 0x0 0x80000000>; ++ }; ++ ++ adc-keys { ++ compatible = "adc-keys"; ++ io-channels = <&saradc 2>; ++ io-channel-names = "buttons"; ++ keyup-threshold-microvolt = <1800000>; ++ ++ button-function { ++ label = "RST"; ++ linux,code = ; ++ press-threshold-microvolt = <40000>; ++ }; ++ }; ++ ++ emmc_pwrseq: emmc-pwrseq { ++ compatible = "mmc-pwrseq-emmc"; ++ reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; ++ }; ++ ++ fan0: pwm-fan { ++ compatible = "pwm-fan"; ++ #cooling-cells = <2>; ++ cooling-min-state = <0>; ++ cooling-max-state = <3>; ++ cooling-levels = <0 120 170 220>; ++ pwms = <&pwm_cd 1 40000 0>; ++ }; ++ ++ hdmi-connector { ++ compatible = "hdmi-connector"; ++ type = "a"; ++ ++ port { ++ hdmi_connector_in: endpoint { ++ remote-endpoint = <&hdmi_tx_tmds_out>; ++ }; ++ }; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ green { ++ color = ; ++ function = LED_FUNCTION_STATUS; ++ gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>; ++ }; ++ ++ blue { ++ color = ; ++ function = LED_FUNCTION_STATUS; ++ gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_LOW>; ++ linux,default-trigger = "heartbeat"; ++ }; ++ }; ++ ++ sdio_pwrseq: sdio-pwrseq { ++ compatible = "mmc-pwrseq-simple"; ++ reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>; ++ clocks = <&wifi32k>; ++ clock-names = "ext_clock"; ++ }; ++ ++ wifi32k: wifi32k { ++ compatible = "pwm-clock"; ++ #clock-cells = <0>; ++ clock-frequency = <32768>; ++ pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ ++ }; ++ ++ dc_in: regulator-dc_in { ++ compatible = "regulator-fixed"; ++ regulator-name = "DC_IN"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-always-on; ++ }; ++ ++ vcc_5v: regulator-vcc_5v { ++ compatible = "regulator-fixed"; ++ regulator-name = "VCC_5V"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ vin-supply = <&dc_in>; ++ ++ gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>; ++ enable-active-high; ++ }; ++ ++ vcc_3v3: regulator-vcc_3v3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VCC_3V3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ vin-supply = <&vsys_3v3>; ++ regulator-always-on; ++ }; ++ ++ vcc_1v8: regulator-vcc_1v8 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VCC_1V8"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ vin-supply = <&vcc_3v3>; ++ regulator-always-on; ++ }; ++ ++ vddao_1v8: regulator-vddao_1v8 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VDDIO_AO1V8"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ vin-supply = <&vsys_3v3>; ++ regulator-always-on; ++ }; ++ ++ vddcpu_a: regulator-vddcpu-a { ++ compatible = "pwm-regulator"; ++ regulator-name = "VDDCPU_A"; ++ regulator-min-microvolt = <690000>; ++ regulator-max-microvolt = <1050000>; ++ pwm-supply = <&dc_in>; ++ pwms = <&pwm_ab 0 1250 0>; ++ pwm-dutycycle-range = <100 0>; ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ++ vddcpu_b: regulator-vddcpu-b { ++ compatible = "pwm-regulator"; ++ regulator-name = "VDDCPU_B"; ++ regulator-min-microvolt = <690000>; ++ regulator-max-microvolt = <1050000>; ++ pwm-supply = <&vsys_3v3>; ++ pwms = <&pwm_AO_cd 1 1250 0>; ++ pwm-dutycycle-range = <100 0>; ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ++ vsys_3v3: regulator-vsys_3v3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VSYS_3V3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ vin-supply = <&dc_in>; ++ regulator-always-on; ++ }; ++ ++ emmc_1v8: regulator-emmc_1v8 { ++ compatible = "regulator-fixed"; ++ regulator-name = "EMMC_AO1V8"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ vin-supply = <&vcc_3v3>; ++ regulator-always-on; ++ }; ++ ++ usb_pwr: regulator-usb_pwr { ++ compatible = "regulator-fixed"; ++ regulator-name = "USB_PWR"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ vin-supply = <&vcc_5v>; ++ ++ gpio = <&gpio GPIOA_6 GPIO_ACTIVE_HIGH>; ++ enable-active-high; ++ }; ++ ++ sound { ++ compatible = "amlogic,axg-sound-card"; ++ model = "BPI-M2S"; ++ audio-aux-devs = <&tdmin_a>, <&tdmout_a>; ++ audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0", ++ "TDMOUT_A IN 1", "FRDDR_B OUT 0", ++ "TDMOUT_A IN 2", "FRDDR_C OUT 0", ++ "TDM_A Playback", "TDMOUT_A OUT", ++ "TDMIN_A IN 0", "TDM_A Capture", ++ "TDMIN_A IN 3", "TDM_A Loopback", ++ "TODDR_A IN 0", "TDMIN_A OUT", ++ "TODDR_B IN 0", "TDMIN_A OUT", ++ "TODDR_C IN 0", "TDMIN_A OUT"; ++ ++ assigned-clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ assigned-clock-parents = <0>, <0>, <0>; ++ assigned-clock-rates = <294912000>, ++ <270950400>, ++ <393216000>; ++ ++ dai-link-0 { ++ sound-dai = <&frddr_a>; ++ }; ++ ++ dai-link-1 { ++ sound-dai = <&frddr_b>; ++ }; ++ ++ dai-link-2 { ++ sound-dai = <&frddr_c>; ++ }; ++ ++ dai-link-3 { ++ sound-dai = <&toddr_a>; ++ }; ++ ++ dai-link-4 { ++ sound-dai = <&toddr_b>; ++ }; ++ ++ dai-link-5 { ++ sound-dai = <&toddr_c>; ++ }; ++ ++ /* 8ch hdmi interface */ ++ dai-link-6 { ++ sound-dai = <&tdmif_a>; ++ dai-format = "i2s"; ++ dai-tdm-slot-tx-mask-0 = <1 1>; ++ dai-tdm-slot-tx-mask-1 = <1 1>; ++ dai-tdm-slot-tx-mask-2 = <1 1>; ++ dai-tdm-slot-tx-mask-3 = <1 1>; ++ mclk-fs = <256>; ++ ++ codec { ++ sound-dai = <&tohdmitx TOHDMITX_I2S_IN_A>; ++ }; ++ }; ++ ++ /* hdmi glue */ ++ dai-link-7 { ++ sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>; ++ ++ codec { ++ sound-dai = <&hdmi_tx>; ++ }; ++ }; ++ }; ++}; ++ ++&arb { ++ status = "okay"; ++}; ++ ++&clkc_audio { ++ status = "okay"; ++}; ++ ++&cec_AO { ++ pinctrl-0 = <&cec_ao_a_h_pins>; ++ pinctrl-names = "default"; ++ status = "disabled"; ++ hdmi-phandle = <&hdmi_tx>; ++}; ++ ++&cecb_AO { ++ pinctrl-0 = <&cec_ao_b_h_pins>; ++ pinctrl-names = "default"; ++ status = "okay"; ++ hdmi-phandle = <&hdmi_tx>; ++}; ++ ++&cpu0 { ++ cpu-supply = <&vddcpu_b>; ++ operating-points-v2 = <&cpu_opp_table_0>; ++ clocks = <&clkc CLKID_CPU_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu1 { ++ cpu-supply = <&vddcpu_b>; ++ operating-points-v2 = <&cpu_opp_table_0>; ++ clocks = <&clkc CLKID_CPU_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu100 { ++ cpu-supply = <&vddcpu_a>; ++ operating-points-v2 = <&cpub_opp_table_1>; ++ clocks = <&clkc CLKID_CPUB_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu101 { ++ cpu-supply = <&vddcpu_a>; ++ operating-points-v2 = <&cpub_opp_table_1>; ++ clocks = <&clkc CLKID_CPUB_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu102 { ++ cpu-supply = <&vddcpu_a>; ++ operating-points-v2 = <&cpub_opp_table_1>; ++ clocks = <&clkc CLKID_CPUB_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu103 { ++ cpu-supply = <&vddcpu_a>; ++ operating-points-v2 = <&cpub_opp_table_1>; ++ clocks = <&clkc CLKID_CPUB_CLK>; ++ clock-latency = <50000>; ++}; ++ ++ðmac { ++ pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; ++ pinctrl-names = "default"; ++ status = "okay"; ++ phy-mode = "rgmii"; ++ phy-handle = <&external_phy>; ++ amlogic,tx-delay-ns = <2>; ++}; ++ ++&ext_mdio { ++ external_phy: ethernet-phy@0 { ++ /* Realtek RTL8211F (0x001cc916) */ ++ reg = <0>; ++ max-speed = <1000>; ++ ++ reset-assert-us = <10000>; ++ reset-deassert-us = <80000>; ++ reset-gpios = <&gpio GPIOZ_15 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>; ++ ++ interrupt-parent = <&gpio_intc>; ++ /* MAC_INTR on GPIOZ_14 */ ++ interrupts = <26 IRQ_TYPE_LEVEL_LOW>; ++ }; ++}; ++ ++&frddr_a { ++ status = "okay"; ++}; ++ ++&frddr_b { ++ status = "okay"; ++}; ++ ++&frddr_c { ++ status = "okay"; ++}; ++ ++&hdmi_tx { ++ status = "okay"; ++ pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>; ++ pinctrl-names = "default"; ++ hdmi-supply = <&vcc_5v>; ++}; ++ ++&hdmi_tx_tmds_port { ++ hdmi_tx_tmds_out: endpoint { ++ remote-endpoint = <&hdmi_connector_in>; ++ }; ++}; ++ ++&pcie { ++ status = "okay"; ++ reset-gpios = <&gpio GPIOA_8 GPIO_ACTIVE_LOW>; ++}; ++ ++&pwm_ab { ++ status = "okay"; ++ pinctrl-0 = <&pwm_a_e_pins>; ++ pinctrl-names = "default"; ++ clocks = <&xtal>; ++ clock-names = "clkin0"; ++}; ++ ++&pwm_cd { ++ status = "okay"; ++ pinctrl-0 = <&pwm_d_x6_pins>; ++ pinctrl-names = "default"; ++ pwm-gpios = <&gpio GPIOAO_10 GPIO_ACTIVE_HIGH>; ++}; ++ ++&pwm_ef { ++ status = "okay"; ++ pinctrl-0 = <&pwm_e_pins>; ++ pinctrl-names = "default"; ++}; ++ ++&pwm_AO_cd { ++ pinctrl-0 = <&pwm_ao_d_e_pins>; ++ pinctrl-names = "default"; ++ clocks = <&xtal>; ++ clock-names = "clkin1"; ++ status = "okay"; ++}; ++ ++&saradc { ++ status = "okay"; ++ vref-supply = <&vddao_1v8>; ++}; ++ ++/* SDIO */ ++&sd_emmc_a { ++ status = "okay"; ++ pinctrl-0 = <&sdio_pins>; ++ pinctrl-1 = <&sdio_clk_gate_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ bus-width = <4>; ++ sd-uhs-sdr104; ++ max-frequency = <50000000>; ++ ++ non-removable; ++ disable-wp; ++ ++ /* WiFi firmware requires power to be kept while in suspend */ ++ keep-power-in-suspend; ++ ++ mmc-pwrseq = <&sdio_pwrseq>; ++ ++ vmmc-supply = <&vsys_3v3>; ++ vqmmc-supply = <&vddao_1v8>; ++ ++ rtl8822cs: wifi@1 { ++ reg = <1>; ++ }; ++}; ++ ++/* SD card */ ++&sd_emmc_b { ++ status = "okay"; ++ pinctrl-0 = <&sdcard_c_pins>; ++ pinctrl-1 = <&sdcard_clk_gate_c_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ ++ bus-width = <4>; ++ cap-sd-highspeed; ++ max-frequency = <50000000>; ++ disable-wp; ++ ++ cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>; ++ vmmc-supply = <&vsys_3v3>; ++ vqmmc-supply = <&vsys_3v3>; ++}; ++ ++/* eMMC */ ++&sd_emmc_c { ++ status = "okay"; ++ pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_8b_pins>, <&emmc_ds_pins>; ++ pinctrl-1 = <&emmc_clk_gate_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ ++ bus-width = <8>; ++ cap-mmc-highspeed; ++ mmc-ddr-1_8v; ++ mmc-hs200-1_8v; ++ max-frequency = <200000000>; ++ disable-wp; ++ ++ mmc-pwrseq = <&emmc_pwrseq>; ++ vmmc-supply = <&vcc_3v3>; ++ vqmmc-supply = <&emmc_1v8>; ++}; ++ ++&tdmif_a { ++ status = "okay"; ++}; ++ ++&tdmin_a { ++ status = "okay"; ++}; ++ ++&tdmout_a { ++ status = "okay"; ++}; ++ ++&toddr_a { ++ status = "okay"; ++}; ++ ++&toddr_b { ++ status = "okay"; ++}; ++ ++&toddr_c { ++ status = "okay"; ++}; ++ ++&tohdmitx { ++ status = "okay"; ++}; ++ ++&uart_A { ++ status = "disabled"; ++ pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; ++ pinctrl-names = "default"; ++ uart-has-rtscts; ++ ++ bluetooth { ++ compatible = "realtek,rtl8822cs-bt"; ++ enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; ++ host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>; ++ device-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>; ++ max-speed = <2000000>; ++ }; ++}; ++ ++&uart_AO { ++ status = "okay"; ++ pinctrl-0 = <&uart_ao_a_pins>; ++ pinctrl-names = "default"; ++}; ++ ++&usb2_phy0 { ++ phy-supply = <&dc_in>; ++}; ++ ++&usb2_phy1 { ++ phy-supply = <&usb_pwr>; ++}; ++ ++&usb3_pcie_phy { ++ phy-supply = <&usb_pwr>; ++}; ++ ++&usb { ++ status = "okay"; ++ dr_mode = "peripheral"; ++ phys = <&usb2_phy0>, <&usb2_phy1>; ++ phy-names = "usb2-phy0", "usb2-phy1"; ++}; +diff --git a/arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts b/arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts +new file mode 100644 +index 0000000000..7f66f263a2 +--- /dev/null ++++ b/arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts +@@ -0,0 +1,14 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2023 Christian Hewitt ++ */ ++ ++/dts-v1/; ++ ++#include "meson-g12b-s922x.dtsi" ++#include "meson-g12b-bananapi.dtsi" ++ ++/ { ++ compatible = "bananapi,bpi-m2s", "amlogic,s922x", "amlogic,g12b"; ++ model = "BananaPi M2S"; ++}; +-- +2.34.1 +