hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf
kernel/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
....@@ -151,7 +151,7 @@
151151 scpi_clocks: clocks {
152152 compatible = "arm,scpi-clocks";
153153
154
- scpi_dvfs: clock-controller {
154
+ scpi_dvfs: clocks-0 {
155155 compatible = "arm,scpi-dvfs-clocks";
156156 #clock-cells = <1>;
157157 clock-indices = <0>;
....@@ -160,7 +160,7 @@
160160 };
161161
162162 scpi_sensors: sensors {
163
- compatible = "amlogic,meson-gxbb-scpi-sensors";
163
+ compatible = "amlogic,meson-gxbb-scpi-sensors", "arm,scpi-sensors";
164164 #thermal-sensor-cells = <1>;
165165 };
166166 };
....@@ -1754,7 +1754,7 @@
17541754 sd_emmc_b: sd@5000 {
17551755 compatible = "amlogic,meson-axg-mmc";
17561756 reg = <0x0 0x5000 0x0 0x800>;
1757
- interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;
1757
+ interrupts = <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>;
17581758 status = "disabled";
17591759 clocks = <&clkc CLKID_SD_EMMC_B>,
17601760 <&clkc CLKID_SD_EMMC_B_CLK0>,
....@@ -1766,7 +1766,7 @@
17661766 sd_emmc_c: mmc@7000 {
17671767 compatible = "amlogic,meson-axg-mmc";
17681768 reg = <0x0 0x7000 0x0 0x800>;
1769
- interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;
1769
+ interrupts = <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>;
17701770 status = "disabled";
17711771 clocks = <&clkc CLKID_SD_EMMC_C>,
17721772 <&clkc CLKID_SD_EMMC_C_CLK0>,