Merge branch 'istoreos-22.03' of https://github.com/istoreos/istoreos into istoreos-22.03

This commit is contained in:
kos 2024-04-13 11:28:21 +00:00
commit dbac1c5dae
5 changed files with 46 additions and 17 deletions

View File

@ -16,10 +16,12 @@ boot() {
}
start() {
[ -e "/dev/rtc" ] && RTC_DEV=/dev/rtc
[ -e "$RTC_DEV" ] && [ -e "$HWCLOCK" ] && $HWCLOCK -s -u -f $RTC_DEV
}
stop() {
[ -e "/dev/rtc" ] && RTC_DEV=/dev/rtc
[ -e "$RTC_DEV" ] && [ -e "$HWCLOCK" ] && $HWCLOCK -w -u -f $RTC_DEV && \
logger -t sysfixtime "saved '$(date)' to $RTC_DEV"
}

View File

@ -221,6 +221,7 @@
};
};
#else
&hdmi_in_vp0 {
status = "okay";
};
@ -230,8 +231,6 @@
};
#endif
&hdmi_sound {
status = "okay";
};
@ -388,8 +387,8 @@
regulator-name = "vccio_acodec";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-state-mem {
regulator-off-in-suspend;
@ -488,7 +487,7 @@
};
&gmac1 {
snps,reset-gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
snps,reset-gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_LOW>;
snps,reset-active-low;
/* Reset time is 20ms, 100ms for rtl8211f */
snps,reset-delays-us = <0 20000 100000>;
@ -502,10 +501,10 @@
pinctrl-names = "default";
pinctrl-0 = <&gmac1m0_miim
&gmac1m0_tx_bus2_level3
&gmac1m0_tx_bus2
&gmac1m0_rx_bus2
&gmac1m0_rgmii_clk_level2
&gmac1m0_rgmii_bus_level3>;
&gmac1m0_rgmii_clk
&gmac1m0_rgmii_bus>;
tx_delay = <0x41>;
rx_delay = <0x2e>;
@ -774,7 +773,7 @@
status = "okay";
};
&rknpu {
&rknpu {
rknpu-supply = <&vdd_npu>;
status = "okay";
};
@ -793,6 +792,7 @@
&usbdrd_dwc3 {
dr_mode = "host";
extcon = <&usb2phy0>;
status = "okay";
};

View File

@ -372,8 +372,8 @@
regulator-name = "vccio_acodec";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-state-mem {
regulator-off-in-suspend;
@ -472,7 +472,7 @@
};
&gmac1 {
snps,reset-gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
snps,reset-gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_LOW>;
snps,reset-active-low;
/* Reset time is 20ms, 100ms for rtl8211f */
snps,reset-delays-us = <0 20000 100000>;
@ -486,10 +486,10 @@
pinctrl-names = "default";
pinctrl-0 = <&gmac1m0_miim
&gmac1m0_tx_bus2_level3
&gmac1m0_tx_bus2
&gmac1m0_rx_bus2
&gmac1m0_rgmii_clk_level2
&gmac1m0_rgmii_bus_level3>;
&gmac1m0_rgmii_clk
&gmac1m0_rgmii_bus>;
tx_delay = <0x41>;
rx_delay = <0x2e>;
@ -773,7 +773,7 @@
status = "okay";
};
&rknpu {
&rknpu {
rknpu-supply = <&vdd_npu>;
status = "okay";
};
@ -806,4 +806,23 @@
&usbhost30 {
status = "okay";
};
&i2c1 {
status = "okay";
clock-frequency = <100000>;
};
&spi3 {
status = "okay";
//assigned-clock-rates = <200000000>; //默认不用配置SPI 设备工作时钟
max-freq = <48000000>; /* spi internal clk, don't modify */
//dma-names = "tx","rx"; //使能DMA模式
//rx-sample-delay-ns = <10>; //默认不用配置,读采样延时
spi_dev@0 {
compatible = "rockchip,spidev";
reg = <0>;
spi-max-frequency = <12000000>;
spi-lsb-first;
};
};

View File

@ -0,0 +1,9 @@
#!/bin/sh /etc/rc.common
START=00
boot() {
if [ -e /sys/class/rtc/rtc1/device/modalias ]; then
grep -q 'rk808-rtc' /sys/class/rtc/rtc1/device/modalias || ln -s rtc1 /dev/rtc
fi
}

View File

@ -1,4 +1,3 @@
. /lib/functions.sh
preinit_set_gpio() {
# ref package/base-files/files/etc/init.d/gpio_switch