Merge branch 'lf-5.10.y_android' into dev_automotive-12.0_1.1.0
# Conflicts: # drivers/mxc/hantro/hantrodec.c
Showing
- arch/arm64/boot/dts/freescale/imx8mm.dtsi 7 additions, 1 deletionarch/arm64/boot/dts/freescale/imx8mm.dtsi
- arch/arm64/boot/dts/freescale/imx8mn.dtsi 7 additions, 1 deletionarch/arm64/boot/dts/freescale/imx8mn.dtsi
- arch/arm64/boot/dts/freescale/imx8mp.dtsi 8 additions, 1 deletionarch/arm64/boot/dts/freescale/imx8mp.dtsi
- arch/arm64/boot/dts/freescale/imx8qm-mek.dts 2 additions, 1 deletionarch/arm64/boot/dts/freescale/imx8qm-mek.dts
- arch/arm64/boot/dts/freescale/imx8qm.dtsi 19 additions, 0 deletionsarch/arm64/boot/dts/freescale/imx8qm.dtsi
- arch/arm64/boot/dts/freescale/imx8qxp.dtsi 5 additions, 0 deletionsarch/arm64/boot/dts/freescale/imx8qxp.dtsi
- arch/arm64/boot/dts/freescale/imx8x-mek.dtsi 2 additions, 1 deletionarch/arm64/boot/dts/freescale/imx8x-mek.dtsi
- arch/arm64/configs/imx8mp_powersave_gki.fragment 126 additions, 0 deletionsarch/arm64/configs/imx8mp_powersave_gki.fragment
- arch/arm64/configs/imx_v8_android_defconfig 2 additions, 0 deletionsarch/arm64/configs/imx_v8_android_defconfig
- build.config.imx 1 addition, 0 deletionsbuild.config.imx
- drivers/base/power/domain.c 26 additions, 0 deletionsdrivers/base/power/domain.c
- drivers/clk/imx/Kconfig 4 additions, 0 deletionsdrivers/clk/imx/Kconfig
- drivers/clk/imx/clk-composite-8m.c 4 additions, 0 deletionsdrivers/clk/imx/clk-composite-8m.c
- drivers/gpu/drm/imx/dcnano/dcnano-crtc.c 4 additions, 0 deletionsdrivers/gpu/drm/imx/dcnano/dcnano-crtc.c
- drivers/gpu/drm/imx/dcnano/dcnano-plane.c 1 addition, 0 deletionsdrivers/gpu/drm/imx/dcnano/dcnano-plane.c
- drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx.c 136 additions, 2 deletions...ux/kernel/platform/freescale/gc_hal_kernel_platform_imx.c
- drivers/mxc/hantro/hantrodec.c 2 additions, 2 deletionsdrivers/mxc/hantro/hantrodec.c
- drivers/mxc/hantro_845/hantrodec_845s.c 2 additions, 2 deletionsdrivers/mxc/hantro_845/hantrodec_845s.c
- drivers/mxc/hantro_vc8000e/hx280enc_vc8000e.c 2 additions, 2 deletionsdrivers/mxc/hantro_vc8000e/hx280enc_vc8000e.c
- drivers/thermal/imx8mm_thermal.c 47 additions, 20 deletionsdrivers/thermal/imx8mm_thermal.c
Loading
Please register or sign in to comment