From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 03 Jan 2024 09:43:39 +0000
Subject: [PATCH] update kernel to 5.10.198
---
kernel/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts | 52 ++++++++++------------------------------------------
1 files changed, 10 insertions(+), 42 deletions(-)
diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts b/kernel/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
index 2bb1bcc..3eda89f 100644
--- a/kernel/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
+++ b/kernel/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
@@ -1,43 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
- * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd
+ * Copyright (c) 2022 Rockchip Electronics Co., Ltd.
*
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- * a) This file is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This file is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * Or, alternatively,
- *
- * b) Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
@@ -53,7 +17,7 @@
/ {
compatible = "rockchip,rk3399-mid", "rockchip,rk3399";
chosen: chosen {
- bootargs = "earlycon=uart8250,mmio32,0xff1a0000 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 init=/init initrd=0x62000001,0x00800000 coherent_pool=1m";
+ bootargs = "earlycon=uart8250,mmio32,0xff1a0000 console=ttyFIQ0 init=/init initrd=0x62000001,0x00800000 coherent_pool=1m";
};
adc_keys {
@@ -240,6 +204,7 @@
spdif-sound {
compatible = "simple-audio-card";
simple-audio-card,name = "rockchip,spdif";
+ simple-audio-card,mclk-fs = <128>;
simple-audio-card,cpu {
sound-dai = <&spdif>;
};
@@ -338,7 +303,8 @@
&sdmmc {
clock-frequency = <50000000>;
clock-freq-min-max = <400000 150000000>;
- supports-sd;
+ no-sdio;
+ no-mmc;
bus-width = <4>;
cap-mmc-highspeed;
cap-sd-highspeed;
@@ -354,7 +320,8 @@
&sdio0 {
clock-frequency = <150000000>;
clock-freq-min-max = <200000 150000000>;
- supports-sdio;
+ no-sd;
+ no-mmc;
bus-width = <4>;
disable-wp;
cap-sd-highspeed;
@@ -376,7 +343,8 @@
&sdhci {
bus-width = <8>;
mmc-hs400-1_8v;
- supports-emmc;
+ no-sdio;
+ no-sd;
non-removable;
keep-power-in-suspend;
mmc-hs400-enhanced-strobe;
--
Gitblit v1.6.2