From 7c73d7a61f0724f9a4465604ffb683bcd18a997d Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Tue, 4 Jun 2019 21:35:48 +0200 Subject: [PATCH] [ nanopik2 ] enable eMMC support for u-boot and kernel while booting from it is not supported with this commit yet. It will require some further first stage boot loader tweaking. --- config/kernel/linux-meson64-default.config | 2 +- config/kernel/linux-meson64-dev.config | 2 +- config/kernel/linux-meson64-next.config | 3 ++- .../nanopi_k2_enable_emmc.patch | 22 +++++++++++++++++++ .../meson64-dev/nanopi_k2_enable_emmc.patch | 22 +++++++++++++++++++ .../meson64-next/nanopi_k2_enable_emmc.patch | 22 +++++++++++++++++++ .../add-emmc-support-for-nanopi-k2.patch | 22 +++++++++++++++++++ 7 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 patch/kernel/meson64-default/nanopi_k2_enable_emmc.patch create mode 100644 patch/kernel/meson64-dev/nanopi_k2_enable_emmc.patch create mode 100644 patch/kernel/meson64-next/nanopi_k2_enable_emmc.patch create mode 100644 patch/u-boot/u-boot-meson64/add-emmc-support-for-nanopi-k2.patch diff --git a/config/kernel/linux-meson64-default.config b/config/kernel/linux-meson64-default.config index a5e723ed2..4a766b2b6 100644 --- a/config/kernel/linux-meson64-default.config +++ b/config/kernel/linux-meson64-default.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.14.122 Kernel Configuration +# Linux/arm64 4.14.123 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y diff --git a/config/kernel/linux-meson64-dev.config b/config/kernel/linux-meson64-dev.config index 750b5c04b..09b3b65f3 100644 --- a/config/kernel/linux-meson64-dev.config +++ b/config/kernel/linux-meson64-dev.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.1.6 Kernel Configuration +# Linux/arm64 5.1.7 Kernel Configuration # # diff --git a/config/kernel/linux-meson64-next.config b/config/kernel/linux-meson64-next.config index d9bcee008..770d22911 100644 --- a/config/kernel/linux-meson64-next.config +++ b/config/kernel/linux-meson64-next.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.19.47 Kernel Configuration +# Linux/arm64 4.19.48 Kernel Configuration # # @@ -9,6 +9,7 @@ CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=70401 CONFIG_CLANG_VERSION=0 +CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y diff --git a/patch/kernel/meson64-default/nanopi_k2_enable_emmc.patch b/patch/kernel/meson64-default/nanopi_k2_enable_emmc.patch new file mode 100644 index 000000000..f27399f82 --- /dev/null +++ b/patch/kernel/meson64-default/nanopi_k2_enable_emmc.patch @@ -0,0 +1,22 @@ +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts +index 80c87e0bb..340559727 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts +@@ -382,7 +382,7 @@ + + /* eMMC */ + &sd_emmc_c { +- status = "disabled"; ++ status = "okay"; + pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>; + pinctrl-1 = <&emmc_clk_gate_pins>; + pinctrl-names = "default", "clk-gate"; +@@ -392,8 +392,6 @@ + non-removable; + disable-wp; + cap-mmc-highspeed; +- mmc-ddr-1_8v; +- mmc-hs200-1_8v; + + mmc-pwrseq = <&emmc_pwrseq>; + vmmc-supply = <&vcc3v3>; diff --git a/patch/kernel/meson64-dev/nanopi_k2_enable_emmc.patch b/patch/kernel/meson64-dev/nanopi_k2_enable_emmc.patch new file mode 100644 index 000000000..f27399f82 --- /dev/null +++ b/patch/kernel/meson64-dev/nanopi_k2_enable_emmc.patch @@ -0,0 +1,22 @@ +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts +index 80c87e0bb..340559727 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts +@@ -382,7 +382,7 @@ + + /* eMMC */ + &sd_emmc_c { +- status = "disabled"; ++ status = "okay"; + pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>; + pinctrl-1 = <&emmc_clk_gate_pins>; + pinctrl-names = "default", "clk-gate"; +@@ -392,8 +392,6 @@ + non-removable; + disable-wp; + cap-mmc-highspeed; +- mmc-ddr-1_8v; +- mmc-hs200-1_8v; + + mmc-pwrseq = <&emmc_pwrseq>; + vmmc-supply = <&vcc3v3>; diff --git a/patch/kernel/meson64-next/nanopi_k2_enable_emmc.patch b/patch/kernel/meson64-next/nanopi_k2_enable_emmc.patch new file mode 100644 index 000000000..f27399f82 --- /dev/null +++ b/patch/kernel/meson64-next/nanopi_k2_enable_emmc.patch @@ -0,0 +1,22 @@ +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts +index 80c87e0bb..340559727 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts +@@ -382,7 +382,7 @@ + + /* eMMC */ + &sd_emmc_c { +- status = "disabled"; ++ status = "okay"; + pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>; + pinctrl-1 = <&emmc_clk_gate_pins>; + pinctrl-names = "default", "clk-gate"; +@@ -392,8 +392,6 @@ + non-removable; + disable-wp; + cap-mmc-highspeed; +- mmc-ddr-1_8v; +- mmc-hs200-1_8v; + + mmc-pwrseq = <&emmc_pwrseq>; + vmmc-supply = <&vcc3v3>; diff --git a/patch/u-boot/u-boot-meson64/add-emmc-support-for-nanopi-k2.patch b/patch/u-boot/u-boot-meson64/add-emmc-support-for-nanopi-k2.patch new file mode 100644 index 000000000..a60b65808 --- /dev/null +++ b/patch/u-boot/u-boot-meson64/add-emmc-support-for-nanopi-k2.patch @@ -0,0 +1,22 @@ +diff --git a/arch/arm/dts/meson-gxbb-nanopi-k2.dts b/arch/arm/dts/meson-gxbb-nanopi-k2.dts +index cbe99bd4..213f632d 100644 +--- a/arch/arm/dts/meson-gxbb-nanopi-k2.dts ++++ b/arch/arm/dts/meson-gxbb-nanopi-k2.dts +@@ -314,7 +314,7 @@ + + /* eMMC */ + &sd_emmc_c { +- status = "disabled"; ++ status = "okay"; + pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>; + pinctrl-1 = <&emmc_clk_gate_pins>; + pinctrl-names = "default", "clk-gate"; +@@ -324,8 +324,6 @@ + non-removable; + disable-wp; + cap-mmc-highspeed; +- mmc-ddr-1_8v; +- mmc-hs200-1_8v; + + mmc-pwrseq = <&emmc_pwrseq>; + vmmc-supply = <&vcc3v3>;