From e77c22c0b0780b8287e043d63329559d14092826 Mon Sep 17 00:00:00 2001 From: mason Date: Sat, 1 Apr 2023 17:01:15 +0000 Subject: [PATCH] OGU fixing SD card issue --- .../devices/OGU/linux/linux.aarch64.conf | 4 +- projects/Amlogic/packages/linux/package.mk | 2 +- .../linux/patches/OGU/000-ogu-linux.patch | 54 +++++++++---------- 3 files changed, 29 insertions(+), 31 deletions(-) diff --git a/projects/Amlogic/devices/OGU/linux/linux.aarch64.conf b/projects/Amlogic/devices/OGU/linux/linux.aarch64.conf index ea0e928b8..10eee7278 100644 --- a/projects/Amlogic/devices/OGU/linux/linux.aarch64.conf +++ b/projects/Amlogic/devices/OGU/linux/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.1.21 Kernel Configuration +# Linux/arm64 6.1.22 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-libreelec-linux-gnueabi-gcc-12.2.0 (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -6476,7 +6476,7 @@ CONFIG_VFAT_FS=y CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="ascii" # CONFIG_FAT_DEFAULT_UTF8 is not set -CONFIG_EXFAT_FS=m +CONFIG_EXFAT_FS=y CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" # CONFIG_NTFS_FS is not set # CONFIG_NTFS3_FS is not set diff --git a/projects/Amlogic/packages/linux/package.mk b/projects/Amlogic/packages/linux/package.mk index e86da9531..a2e490755 100644 --- a/projects/Amlogic/packages/linux/package.mk +++ b/projects/Amlogic/packages/linux/package.mk @@ -19,7 +19,7 @@ PKG_PATCH_DIRS+="${DEVICE}" case ${DEVICE} in OGU) - PKG_VERSION="6.1.21" + PKG_VERSION="6.1.22" PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" ;; esac diff --git a/projects/Amlogic/packages/linux/patches/OGU/000-ogu-linux.patch b/projects/Amlogic/packages/linux/patches/OGU/000-ogu-linux.patch index d98c43080..6c9aded4f 100644 --- a/projects/Amlogic/packages/linux/patches/OGU/000-ogu-linux.patch +++ b/projects/Amlogic/packages/linux/patches/OGU/000-ogu-linux.patch @@ -1,6 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech) - diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/Makefile linux/arch/arm64/boot/dts/amlogic/Makefile --- linux.orig/arch/arm64/boot/dts/amlogic/Makefile 2023-03-22 12:34:07.000000000 +0000 +++ linux/arch/arm64/boot/dts/amlogic/Makefile 2023-03-31 16:27:15.048741724 +0000 @@ -35,8 +32,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi linux/ar operating-points-v2 = <&gpu_opp_table>; diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts linux/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts --- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts 1970-01-01 00:00:00.000000000 +0000 -+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts 2023-03-31 21:09:14.945029163 +0000 -@@ -0,0 +1,956 @@ ++++ linux/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts 2023-04-01 15:14:24.576697726 +0000 +@@ -0,0 +1,957 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2022 Neil Armstrong @@ -58,6 +55,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts + aliases { + serial0 = &uart_AO; + rtc0 = &vrtc; ++ mmc0 = &sd_emmc_c; ++ mmc1 = &sd_emmc_b; + }; + + reserved-memory { @@ -912,24 +911,6 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts + vref-supply = <&vddio_ao1v8>; +}; + -+/* 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 = <&vcc_sd>; -+ vqmmc-supply = <&vddio_c>; -+ -+}; -+ +/* eMMC */ +&sd_emmc_c { + status = "okay"; @@ -949,6 +930,23 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts + vqmmc-supply = <&vddio_ao1v8>; +}; + ++/* 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 = <&vcc_sd>; ++ vqmmc-supply = <&vddio_c>; ++ ++}; + +&tdmif_b { + pinctrl-0 = <&tdm_b_dout0_pins>, <&tdm_b_fs_pins>, <&tdm_b_sclk_pins>, <&tdm_b_din1_pins>; @@ -159391,11 +159389,11 @@ diff -rupN linux.orig/drivers/gpu/arm/midgard/tl/mali_kbase_tracepoints.h linux/ +#endif diff -rupN linux.orig/drivers/gpu/drm/drm_panel_orientation_quirks.c linux/drivers/gpu/drm/drm_panel_orientation_quirks.c --- linux.orig/drivers/gpu/drm/drm_panel_orientation_quirks.c 2023-03-22 12:34:07.000000000 +0000 -+++ linux/drivers/gpu/drm/drm_panel_orientation_quirks.c 2023-03-31 20:21:22.757309368 +0000 -@@ -445,7 +445,7 @@ int drm_get_panel_orientation_quirk(int - return data->orientation; - } - ++++ linux/drivers/gpu/drm/drm_panel_orientation_quirks.c 2023-04-01 11:55:18.049325780 +0000 +@@ -454,7 +454,7 @@ EXPORT_SYMBOL(drm_get_panel_orientation_ + /* There are no quirks for non x86 devices yet */ + int drm_get_panel_orientation_quirk(int width, int height) + { - return DRM_MODE_PANEL_ORIENTATION_UNKNOWN; + return DRM_MODE_PANEL_ORIENTATION_LEFT_UP; }