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/px30-evb-ddr4-v10.dts | 49 ++-----------------------------------------------
1 files changed, 2 insertions(+), 47 deletions(-)
diff --git a/kernel/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts b/kernel/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts
index ef9f356..f128872 100644
--- a/kernel/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts
+++ b/kernel/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts
@@ -4,38 +4,14 @@
*/
/dts-v1/;
+#include "px30.dtsi"
+#include "px30-android.dtsi"
#include "px30-evb-ddr3-v10.dtsi"
#include "px30-ddr4p416dd6-timing.dtsi"
/ {
model = "Rockchip PX30 evb ddr4 board";
compatible = "rockchip,px30-evb-ddr4-v10", "rockchip,px30";
-
- rk_headset: rk-headset {
- compatible = "rockchip_headset";
- headset_gpio = <&gpio2 RK_PB0 GPIO_ACTIVE_LOW>;
- pinctrl-names = "default";
- pinctrl-0 = <&hp_det>;
- io-channels = <&saradc 1>;
- };
-
- wireless-bluetooth {
- compatible = "bluetooth-platdata";
- clocks = <&rk809 1>;
- clock-names = "ext_clock";
- uart_rts_gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>;
- pinctrl-names = "default","rts_gpio";
- pinctrl-0 = <&uart1_rts>;
- pinctrl-1 = <&uart1_rts_gpio>;
- BT,reset_gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>;
- BT,wake_gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>;
- BT,wake_host_irq = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
- status = "okay";
- };
-};
-
-&chosen {
- bootargs_ext = "androidboot.boot_devices=ff390000.dwmmc,ff3b0000.nandc";
};
&dsi {
@@ -293,27 +269,6 @@
de-active = <0>;
pixelclk-active = <0>;
};
- };
- };
-};
-
-&gmac {
- phy-supply = <&vcc_phy>;
- clock_in_out = "input";
- assigned-clocks = <&cru SCLK_GMAC>;
- assigned-clock-parents = <&gmac_clkin>;
- pinctrl-names = "default";
- pinctrl-0 = <&rmii_pins &mac_refclk>;
- snps,reset-gpio = <&gpio2 13 GPIO_ACTIVE_LOW>;
- snps,reset-active-low;
- snps,reset-delays-us = <0 50000 50000>;
- status = "okay";
-};
-
-&pinctrl {
- headphone {
- hp_det: hp-det {
- rockchip,pins = <2 RK_PB0 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
};
--
Gitblit v1.6.2