From 82f64a82c42ac9c666f007739fbce5dc95d336a7 Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Sun, 27 Oct 2019 11:07:05 +0100 Subject: [PATCH] Removed dmesg boot errors --- ...ey-dts.patch => 0003-add-funkey-dts.patch} | 0 ... => 0004-add-funkey-dts-to-Makefile.patch} | 0 ...add-axp209.patch => 0005-add-axp209.patch} | 0 ...patch => 0006-comment-backlight-dts.patch} | 0 ...fbtft_39Hz.patch => 0007-fbtft_39Hz.patch} | 0 ...e.patch => 0008-boot_logo_dark_mode.patch} | 0 .../linux/0009-add-cpu-clock-properties.patch | 22 ++++++++++ ...0009-remove_boot_error_msg_sun4i-SOC.patch | 43 ------------------- .../linux/0010-reorder-sunxi-aux-codec.patch | 39 +++++++++++++++++ buildroot | 2 +- 10 files changed, 62 insertions(+), 44 deletions(-) rename FunKey/board/funkey/patches/linux/{0004-add-funkey-dts.patch => 0003-add-funkey-dts.patch} (100%) rename FunKey/board/funkey/patches/linux/{0005-add-funkey-dts-to-Makefile.patch => 0004-add-funkey-dts-to-Makefile.patch} (100%) rename FunKey/board/funkey/patches/linux/{0006-add-axp209.patch => 0005-add-axp209.patch} (100%) rename FunKey/board/funkey/patches/linux/{0007-comment-backlight-dts.patch => 0006-comment-backlight-dts.patch} (100%) rename FunKey/board/funkey/patches/linux/{0008-fbtft_39Hz.patch => 0007-fbtft_39Hz.patch} (100%) rename FunKey/board/funkey/patches/linux/{0010-boot_logo_dark_mode.patch => 0008-boot_logo_dark_mode.patch} (100%) create mode 100644 FunKey/board/funkey/patches/linux/0009-add-cpu-clock-properties.patch delete mode 100644 FunKey/board/funkey/patches/linux/0009-remove_boot_error_msg_sun4i-SOC.patch create mode 100644 FunKey/board/funkey/patches/linux/0010-reorder-sunxi-aux-codec.patch diff --git a/FunKey/board/funkey/patches/linux/0004-add-funkey-dts.patch b/FunKey/board/funkey/patches/linux/0003-add-funkey-dts.patch similarity index 100% rename from FunKey/board/funkey/patches/linux/0004-add-funkey-dts.patch rename to FunKey/board/funkey/patches/linux/0003-add-funkey-dts.patch diff --git a/FunKey/board/funkey/patches/linux/0005-add-funkey-dts-to-Makefile.patch b/FunKey/board/funkey/patches/linux/0004-add-funkey-dts-to-Makefile.patch similarity index 100% rename from FunKey/board/funkey/patches/linux/0005-add-funkey-dts-to-Makefile.patch rename to FunKey/board/funkey/patches/linux/0004-add-funkey-dts-to-Makefile.patch diff --git a/FunKey/board/funkey/patches/linux/0006-add-axp209.patch b/FunKey/board/funkey/patches/linux/0005-add-axp209.patch similarity index 100% rename from FunKey/board/funkey/patches/linux/0006-add-axp209.patch rename to FunKey/board/funkey/patches/linux/0005-add-axp209.patch diff --git a/FunKey/board/funkey/patches/linux/0007-comment-backlight-dts.patch b/FunKey/board/funkey/patches/linux/0006-comment-backlight-dts.patch similarity index 100% rename from FunKey/board/funkey/patches/linux/0007-comment-backlight-dts.patch rename to FunKey/board/funkey/patches/linux/0006-comment-backlight-dts.patch diff --git a/FunKey/board/funkey/patches/linux/0008-fbtft_39Hz.patch b/FunKey/board/funkey/patches/linux/0007-fbtft_39Hz.patch similarity index 100% rename from FunKey/board/funkey/patches/linux/0008-fbtft_39Hz.patch rename to FunKey/board/funkey/patches/linux/0007-fbtft_39Hz.patch diff --git a/FunKey/board/funkey/patches/linux/0010-boot_logo_dark_mode.patch b/FunKey/board/funkey/patches/linux/0008-boot_logo_dark_mode.patch similarity index 100% rename from FunKey/board/funkey/patches/linux/0010-boot_logo_dark_mode.patch rename to FunKey/board/funkey/patches/linux/0008-boot_logo_dark_mode.patch diff --git a/FunKey/board/funkey/patches/linux/0009-add-cpu-clock-properties.patch b/FunKey/board/funkey/patches/linux/0009-add-cpu-clock-properties.patch new file mode 100644 index 0000000..df3bf7c --- /dev/null +++ b/FunKey/board/funkey/patches/linux/0009-add-cpu-clock-properties.patch @@ -0,0 +1,22 @@ +diff --git a/arch/arm/boot/dts/sun8i-v3s.dtsi b/arch/arm/boot/dts/sun8i-v3s.dtsi +index 5379f2d7..f9765995 100644 +--- a/arch/arm/boot/dts/sun8i-v3s.dtsi ++++ b/arch/arm/boot/dts/sun8i-v3s.dtsi +@@ -73,6 +73,17 @@ + device_type = "cpu"; + reg = <0>; + clocks = <&ccu CLK_CPU>; ++ clock-latency = <244144>; /* 8 32k periods */ ++ clock-frequency = <1296000>; ++ operating-points = < ++ /* kHz uV */ ++ 1296000 1200000 ++ 1008000 1200000 ++ 864000 1200000 ++ 720000 1100000 ++ 480000 1000000 ++ >; ++ + }; + }; + diff --git a/FunKey/board/funkey/patches/linux/0009-remove_boot_error_msg_sun4i-SOC.patch b/FunKey/board/funkey/patches/linux/0009-remove_boot_error_msg_sun4i-SOC.patch deleted file mode 100644 index 52bd946..0000000 --- a/FunKey/board/funkey/patches/linux/0009-remove_boot_error_msg_sun4i-SOC.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 2acecf3490c797aee0cb764ca893f7bb4ad7f1d8 Mon Sep 17 00:00:00 2001 -From: vincent -Date: Sat, 26 Oct 2019 12:04:55 +0200 -Subject: [PATCH] sun4i_soc remove error messages at boot - ---- - sound/soc/soc-core.c | 4 +++- - sound/soc/sunxi/sun4i-codec.c | 4 +++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c -index fee4b0e..2d32f6e 100644 ---- a/sound/soc/soc-core.c -+++ b/sound/soc/soc-core.c -@@ -1843,7 +1843,9 @@ static int soc_bind_aux_dev(struct snd_soc_card *card, int num) - return 0; - - err_defer: -- dev_err(card->dev, "ASoC: %s not registered\n", name); -+ // FunKey change -+ //dev_err(card->dev, "ASoC: %s not registered\n", name); -+ dev_warn(card->dev, "ASoC: %s not registered\n", name); - return -EPROBE_DEFER; - } - -diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c -index baa9007..699c7a1 100644 ---- a/sound/soc/sunxi/sun4i-codec.c -+++ b/sound/soc/sunxi/sun4i-codec.c -@@ -1659,7 +1659,9 @@ static int sun4i_codec_probe(struct platform_device *pdev) - - ret = snd_soc_register_card(card); - if (ret) { -- dev_err(&pdev->dev, "Failed to register our card\n"); -+ // FunKey change -+ //dev_err(&pdev->dev, "Failed to register our card\n"); -+ dev_warn(&pdev->dev, "Failed to register our card\n"); - goto err_unregister_codec; - } - --- -1.9.1 - diff --git a/FunKey/board/funkey/patches/linux/0010-reorder-sunxi-aux-codec.patch b/FunKey/board/funkey/patches/linux/0010-reorder-sunxi-aux-codec.patch new file mode 100644 index 0000000..69ba48d --- /dev/null +++ b/FunKey/board/funkey/patches/linux/0010-reorder-sunxi-aux-codec.patch @@ -0,0 +1,39 @@ +diff --git a/arch/arm/boot/dts/sun8i-v3s-funkey.dts b/arch/arm/boot/dts/sun8i-v3s-funkey.dts +index ad694808..3be3c7f1 100644 +--- a/arch/arm/boot/dts/sun8i-v3s-funkey.dts ++++ b/arch/arm/boot/dts/sun8i-v3s-funkey.dts +@@ -74,6 +74,10 @@ + status = "okay"; + }; + ++&codec_analog { ++ status = "okay"; ++}; ++ + &ehci0 { + status = "okay"; + }; +diff --git a/arch/arm/boot/dts/sun8i-v3s.dtsi b/arch/arm/boot/dts/sun8i-v3s.dtsi +index 5379f2d7..02f6c844 100644 +--- a/arch/arm/boot/dts/sun8i-v3s.dtsi ++++ b/arch/arm/boot/dts/sun8i-v3s.dtsi +@@ -433,6 +444,7 @@ + codec_analog: codec-analog@01c23000 { + compatible = "allwinner,sun8i-v3s-codec-analog"; + reg = <0x01c23000 0x4>; ++ status = "disabled"; + }; + + uart0: serial@01c28000 { +diff --git a/sound/soc/sunxi/Makefile b/sound/soc/sunxi/Makefile +index 4a9ef673..655780ab 100644 +--- a/sound/soc/sunxi/Makefile ++++ b/sound/soc/sunxi/Makefile +@@ -1,6 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 ++obj-$(CONFIG_SND_SUN8I_CODEC_ANALOG) += sun8i-codec-analog.o + obj-$(CONFIG_SND_SUN4I_CODEC) += sun4i-codec.o + obj-$(CONFIG_SND_SUN4I_I2S) += sun4i-i2s.o + obj-$(CONFIG_SND_SUN4I_SPDIF) += sun4i-spdif.o +-obj-$(CONFIG_SND_SUN8I_CODEC_ANALOG) += sun8i-codec-analog.o + obj-$(CONFIG_SND_SUN8I_CODEC) += sun8i-codec.o diff --git a/buildroot b/buildroot index d77f6c1..0e70d7c 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit d77f6c1712400cc6a11ffeb80f9f6d8668834359 +Subproject commit 0e70d7c761fbaaecbc482dcba480151b7d3e11d4