Mark ab/7061308 as merged in stage.

Bug: 180401296
Merged-In: I1fe9023e29d5b1e7d1dbb240fcf397a7010fbc4b
Change-Id: I1b406fa50a3dac307507e1f74e8e2fcafa5ec998
diff --git a/hikey960/5.4/Image b/hikey960/5.4/Image
new file mode 100644
index 0000000..37a1ea4
--- /dev/null
+++ b/hikey960/5.4/Image
Binary files differ
diff --git a/hikey960/5.4/Image.gz b/hikey960/5.4/Image.gz
deleted file mode 100644
index bd59a57..0000000
--- a/hikey960/5.4/Image.gz
+++ /dev/null
Binary files differ
diff --git a/hikey960/5.4/Image.gz-dtb b/hikey960/5.4/Image.gz-dtb
index 59164ea..2cfd83e 100644
--- a/hikey960/5.4/Image.gz-dtb
+++ b/hikey960/5.4/Image.gz-dtb
Binary files differ
diff --git a/hikey960/5.4/adv7511.ko b/hikey960/5.4/adv7511.ko
index 6212552..8728867 100644
--- a/hikey960/5.4/adv7511.ko
+++ b/hikey960/5.4/adv7511.ko
Binary files differ
diff --git a/hikey960/5.4/ambakmi.ko b/hikey960/5.4/ambakmi.ko
index c3e0aca..7683182 100644
--- a/hikey960/5.4/ambakmi.ko
+++ b/hikey960/5.4/ambakmi.ko
Binary files differ
diff --git a/hikey960/5.4/armmmci.ko b/hikey960/5.4/armmmci.ko
index 2a3c7e5..494df23 100644
--- a/hikey960/5.4/armmmci.ko
+++ b/hikey960/5.4/armmmci.ko
Binary files differ
diff --git a/hikey960/5.4/cec.ko b/hikey960/5.4/cec.ko
deleted file mode 100644
index 5812635..0000000
--- a/hikey960/5.4/cec.ko
+++ /dev/null
Binary files differ
diff --git a/hikey960/5.4/clk-hi655x.ko b/hikey960/5.4/clk-hi655x.ko
index f0abdc9..f937be2 100644
--- a/hikey960/5.4/clk-hi655x.ko
+++ b/hikey960/5.4/clk-hi655x.ko
Binary files differ
diff --git a/hikey960/5.4/cma_heap.ko b/hikey960/5.4/cma_heap.ko
new file mode 100644
index 0000000..1bde4ae
--- /dev/null
+++ b/hikey960/5.4/cma_heap.ko
Binary files differ
diff --git a/hikey960/5.4/cn.ko b/hikey960/5.4/cn.ko
index 13ca2ae..f8413ee 100644
--- a/hikey960/5.4/cn.ko
+++ b/hikey960/5.4/cn.ko
Binary files differ
diff --git a/hikey960/5.4/cpufreq-dt.ko b/hikey960/5.4/cpufreq-dt.ko
index 8b01239..12dcd7b 100644
--- a/hikey960/5.4/cpufreq-dt.ko
+++ b/hikey960/5.4/cpufreq-dt.ko
Binary files differ
diff --git a/hikey960/5.4/crc-itu-t.ko b/hikey960/5.4/crc-itu-t.ko
index 9a76d61..d255c5a 100644
--- a/hikey960/5.4/crc-itu-t.ko
+++ b/hikey960/5.4/crc-itu-t.ko
Binary files differ
diff --git a/hikey960/5.4/crc7.ko b/hikey960/5.4/crc7.ko
index 18342b2..774bc08 100644
--- a/hikey960/5.4/crc7.ko
+++ b/hikey960/5.4/crc7.ko
Binary files differ
diff --git a/hikey960/5.4/dw_mmc-exynos.ko b/hikey960/5.4/dw_mmc-exynos.ko
index 8bad3b0..3c312b0 100644
--- a/hikey960/5.4/dw_mmc-exynos.ko
+++ b/hikey960/5.4/dw_mmc-exynos.ko
Binary files differ
diff --git a/hikey960/5.4/dw_mmc-k3.ko b/hikey960/5.4/dw_mmc-k3.ko
index 97251da..8735ca8 100644
--- a/hikey960/5.4/dw_mmc-k3.ko
+++ b/hikey960/5.4/dw_mmc-k3.ko
Binary files differ
diff --git a/hikey960/5.4/dw_mmc-pltfm.ko b/hikey960/5.4/dw_mmc-pltfm.ko
index b6e0188..e13aec1 100644
--- a/hikey960/5.4/dw_mmc-pltfm.ko
+++ b/hikey960/5.4/dw_mmc-pltfm.ko
Binary files differ
diff --git a/hikey960/5.4/dw_mmc.ko b/hikey960/5.4/dw_mmc.ko
index 7bc75a5..594d6e3 100644
--- a/hikey960/5.4/dw_mmc.ko
+++ b/hikey960/5.4/dw_mmc.ko
Binary files differ
diff --git a/hikey960/5.4/dwc3-haps.ko b/hikey960/5.4/dwc3-haps.ko
deleted file mode 100644
index 93cceb2..0000000
--- a/hikey960/5.4/dwc3-haps.ko
+++ /dev/null
Binary files differ
diff --git a/hikey960/5.4/dwc3-of-simple.ko b/hikey960/5.4/dwc3-of-simple.ko
deleted file mode 100644
index 47cc779..0000000
--- a/hikey960/5.4/dwc3-of-simple.ko
+++ /dev/null
Binary files differ
diff --git a/hikey960/5.4/dwc3-qcom.ko b/hikey960/5.4/dwc3-qcom.ko
deleted file mode 100644
index 5cb1038..0000000
--- a/hikey960/5.4/dwc3-qcom.ko
+++ /dev/null
Binary files differ
diff --git a/hikey960/5.4/dwc3.ko b/hikey960/5.4/dwc3.ko
deleted file mode 100644
index 0928860..0000000
--- a/hikey960/5.4/dwc3.ko
+++ /dev/null
Binary files differ
diff --git a/hikey960/5.4/ehci-hcd.ko b/hikey960/5.4/ehci-hcd.ko
index 1730e1b..8765e5c 100644
--- a/hikey960/5.4/ehci-hcd.ko
+++ b/hikey960/5.4/ehci-hcd.ko
Binary files differ
diff --git a/hikey960/5.4/ehci-pci.ko b/hikey960/5.4/ehci-pci.ko
index 954ceb8..ca8c846 100644
--- a/hikey960/5.4/ehci-pci.ko
+++ b/hikey960/5.4/ehci-pci.ko
Binary files differ
diff --git a/hikey960/5.4/ehci-platform.ko b/hikey960/5.4/ehci-platform.ko
index 0eeeb1a..c2c9660 100644
--- a/hikey960/5.4/ehci-platform.ko
+++ b/hikey960/5.4/ehci-platform.ko
Binary files differ
diff --git a/hikey960/5.4/erofs.ko b/hikey960/5.4/erofs.ko
index 7ee78f9..d7e7e2e 100644
--- a/hikey960/5.4/erofs.ko
+++ b/hikey960/5.4/erofs.ko
Binary files differ
diff --git a/hikey960/5.4/gadgetfs.ko b/hikey960/5.4/gadgetfs.ko
index d04736d..45214bd 100644
--- a/hikey960/5.4/gadgetfs.ko
+++ b/hikey960/5.4/gadgetfs.ko
Binary files differ
diff --git a/hikey960/5.4/hi3660-hikey960.dtb b/hikey960/5.4/hi3660-hikey960.dtb
index 0b598e0..b133f4d 100644
--- a/hikey960/5.4/hi3660-hikey960.dtb
+++ b/hikey960/5.4/hi3660-hikey960.dtb
Binary files differ
diff --git a/hikey960/5.4/hi3660-i2s.ko b/hikey960/5.4/hi3660-i2s.ko
index 5fffb0d..2f2b4fd 100644
--- a/hikey960/5.4/hi3660-i2s.ko
+++ b/hikey960/5.4/hi3660-i2s.ko
Binary files differ
diff --git a/hikey960/5.4/hi3660-mailbox.ko b/hikey960/5.4/hi3660-mailbox.ko
index 0a1bcd2..27424bd 100644
--- a/hikey960/5.4/hi3660-mailbox.ko
+++ b/hikey960/5.4/hi3660-mailbox.ko
Binary files differ
diff --git a/hikey960/5.4/hi6421-pmic-core.ko b/hikey960/5.4/hi6421-pmic-core.ko
index aad49be..a50d76c 100644
--- a/hikey960/5.4/hi6421-pmic-core.ko
+++ b/hikey960/5.4/hi6421-pmic-core.ko
Binary files differ
diff --git a/hikey960/5.4/hi6421v530-regulator.ko b/hikey960/5.4/hi6421v530-regulator.ko
index cf91f19..0f8dccb 100644
--- a/hikey960/5.4/hi6421v530-regulator.ko
+++ b/hikey960/5.4/hi6421v530-regulator.ko
Binary files differ
diff --git a/hikey960/5.4/hi655x-pmic.ko b/hikey960/5.4/hi655x-pmic.ko
index ea327a7..a3ddf74 100644
--- a/hikey960/5.4/hi655x-pmic.ko
+++ b/hikey960/5.4/hi655x-pmic.ko
Binary files differ
diff --git a/hikey960/5.4/hi655x-regulator.ko b/hikey960/5.4/hi655x-regulator.ko
index 6cd0199..743834a 100644
--- a/hikey960/5.4/hi655x-regulator.ko
+++ b/hikey960/5.4/hi655x-regulator.ko
Binary files differ
diff --git a/hikey960/5.4/hisi_hikey_usb.ko b/hikey960/5.4/hisi_hikey_usb.ko
index 7985bdd..d978233 100644
--- a/hikey960/5.4/hisi_hikey_usb.ko
+++ b/hikey960/5.4/hisi_hikey_usb.ko
Binary files differ
diff --git a/hikey960/5.4/hisi_powerkey.ko b/hikey960/5.4/hisi_powerkey.ko
index 4175c37..8918593 100644
--- a/hikey960/5.4/hisi_powerkey.ko
+++ b/hikey960/5.4/hisi_powerkey.ko
Binary files differ
diff --git a/hikey960/5.4/hisi_thermal.ko b/hikey960/5.4/hisi_thermal.ko
index f8b0a15..2ff7b7a 100644
--- a/hikey960/5.4/hisi_thermal.ko
+++ b/hikey960/5.4/hisi_thermal.ko
Binary files differ
diff --git a/hikey960/5.4/hwmon.ko b/hikey960/5.4/hwmon.ko
index cd626bc..9a8bf62 100644
--- a/hikey960/5.4/hwmon.ko
+++ b/hikey960/5.4/hwmon.ko
Binary files differ
diff --git a/hikey960/5.4/i2c-designware-core.ko b/hikey960/5.4/i2c-designware-core.ko
index 6b41384..09564d8 100644
--- a/hikey960/5.4/i2c-designware-core.ko
+++ b/hikey960/5.4/i2c-designware-core.ko
Binary files differ
diff --git a/hikey960/5.4/i2c-designware-platform.ko b/hikey960/5.4/i2c-designware-platform.ko
index 7a78ec0..3a888e6 100644
--- a/hikey960/5.4/i2c-designware-platform.ko
+++ b/hikey960/5.4/i2c-designware-platform.ko
Binary files differ
diff --git a/hikey960/5.4/i2c-dev.ko b/hikey960/5.4/i2c-dev.ko
index d80588e..afe514c 100644
--- a/hikey960/5.4/i2c-dev.ko
+++ b/hikey960/5.4/i2c-dev.ko
Binary files differ
diff --git a/hikey960/5.4/incrementalfs.ko b/hikey960/5.4/incrementalfs.ko
deleted file mode 100644
index 636d2f9..0000000
--- a/hikey960/5.4/incrementalfs.ko
+++ /dev/null
Binary files differ
diff --git a/hikey960/5.4/ion_cma_heap.ko b/hikey960/5.4/ion_cma_heap.ko
index 151871f..23e51f3 100644
--- a/hikey960/5.4/ion_cma_heap.ko
+++ b/hikey960/5.4/ion_cma_heap.ko
Binary files differ
diff --git a/hikey960/5.4/k3dma.ko b/hikey960/5.4/k3dma.ko
index 8a5be5f..121df42 100644
--- a/hikey960/5.4/k3dma.ko
+++ b/hikey960/5.4/k3dma.ko
Binary files differ
diff --git a/hikey960/5.4/kirin-drm.ko b/hikey960/5.4/kirin-drm.ko
index 4bcac1d..120fba5 100644
--- a/hikey960/5.4/kirin-drm.ko
+++ b/hikey960/5.4/kirin-drm.ko
Binary files differ
diff --git a/hikey960/5.4/kirin-dsi.ko b/hikey960/5.4/kirin-dsi.ko
index 259b3ad..bc81203 100644
--- a/hikey960/5.4/kirin-dsi.ko
+++ b/hikey960/5.4/kirin-dsi.ko
Binary files differ
diff --git a/hikey960/5.4/mali_kbase.ko b/hikey960/5.4/mali_kbase.ko
index d0ae9ba..5c5f9f9 100644
--- a/hikey960/5.4/mali_kbase.ko
+++ b/hikey960/5.4/mali_kbase.ko
Binary files differ
diff --git a/hikey960/5.4/mmc_block.ko b/hikey960/5.4/mmc_block.ko
index 4ceae56..5f1b986 100644
--- a/hikey960/5.4/mmc_block.ko
+++ b/hikey960/5.4/mmc_block.ko
Binary files differ
diff --git a/hikey960/5.4/mmc_spi.ko b/hikey960/5.4/mmc_spi.ko
index 835ccd9..a640d59 100644
--- a/hikey960/5.4/mmc_spi.ko
+++ b/hikey960/5.4/mmc_spi.ko
Binary files differ
diff --git a/hikey960/5.4/nvme-core.ko b/hikey960/5.4/nvme-core.ko
index cdef9a7..d6ed203 100644
--- a/hikey960/5.4/nvme-core.ko
+++ b/hikey960/5.4/nvme-core.ko
Binary files differ
diff --git a/hikey960/5.4/nvme.ko b/hikey960/5.4/nvme.ko
index 4f2ef9e..f074075 100644
--- a/hikey960/5.4/nvme.ko
+++ b/hikey960/5.4/nvme.ko
Binary files differ
diff --git a/hikey960/5.4/nvmet.ko b/hikey960/5.4/nvmet.ko
index 2a4d8ec..a5b3433 100644
--- a/hikey960/5.4/nvmet.ko
+++ b/hikey960/5.4/nvmet.ko
Binary files differ
diff --git a/hikey960/5.4/of_mmc_spi.ko b/hikey960/5.4/of_mmc_spi.ko
index 7b56258..823dd54 100644
--- a/hikey960/5.4/of_mmc_spi.ko
+++ b/hikey960/5.4/of_mmc_spi.ko
Binary files differ
diff --git a/hikey960/5.4/ohci-hcd.ko b/hikey960/5.4/ohci-hcd.ko
index 31285ef..0b324fc 100644
--- a/hikey960/5.4/ohci-hcd.ko
+++ b/hikey960/5.4/ohci-hcd.ko
Binary files differ
diff --git a/hikey960/5.4/ohci-pci.ko b/hikey960/5.4/ohci-pci.ko
index 88f7954..ab4d4d0 100644
--- a/hikey960/5.4/ohci-pci.ko
+++ b/hikey960/5.4/ohci-pci.ko
Binary files differ
diff --git a/hikey960/5.4/ohci-platform.ko b/hikey960/5.4/ohci-platform.ko
index d6a996f..b9015d5 100644
--- a/hikey960/5.4/ohci-platform.ko
+++ b/hikey960/5.4/ohci-platform.ko
Binary files differ
diff --git a/hikey960/5.4/phy-hi3660-usb3.ko b/hikey960/5.4/phy-hi3660-usb3.ko
index a8c2f1c..0f3ea5f 100644
--- a/hikey960/5.4/phy-hi3660-usb3.ko
+++ b/hikey960/5.4/phy-hi3660-usb3.ko
Binary files differ
diff --git a/hikey960/5.4/reboot-mode.ko b/hikey960/5.4/reboot-mode.ko
index 8b1aa04..20e675f 100644
--- a/hikey960/5.4/reboot-mode.ko
+++ b/hikey960/5.4/reboot-mode.ko
Binary files differ
diff --git a/hikey960/5.4/rfkill-gpio.ko b/hikey960/5.4/rfkill-gpio.ko
index 3a35ef0..263139d 100644
--- a/hikey960/5.4/rfkill-gpio.ko
+++ b/hikey960/5.4/rfkill-gpio.ko
Binary files differ
diff --git a/hikey960/5.4/rtc-efi.ko b/hikey960/5.4/rtc-efi.ko
index 52c833b..5186a2c 100644
--- a/hikey960/5.4/rtc-efi.ko
+++ b/hikey960/5.4/rtc-efi.ko
Binary files differ
diff --git a/hikey960/5.4/sdcardfs.ko b/hikey960/5.4/sdcardfs.ko
deleted file mode 100644
index c1ef07c..0000000
--- a/hikey960/5.4/sdcardfs.ko
+++ /dev/null
Binary files differ
diff --git a/hikey960/5.4/snd-soc-hdmi-codec.ko b/hikey960/5.4/snd-soc-hdmi-codec.ko
index c5c9b93..a9c5248 100644
--- a/hikey960/5.4/snd-soc-hdmi-codec.ko
+++ b/hikey960/5.4/snd-soc-hdmi-codec.ko
Binary files differ
diff --git a/hikey960/5.4/snd-soc-simple-card-utils.ko b/hikey960/5.4/snd-soc-simple-card-utils.ko
index dde8929..a510b9e 100644
--- a/hikey960/5.4/snd-soc-simple-card-utils.ko
+++ b/hikey960/5.4/snd-soc-simple-card-utils.ko
Binary files differ
diff --git a/hikey960/5.4/snd-soc-simple-card.ko b/hikey960/5.4/snd-soc-simple-card.ko
index a44ad9e..598ef59 100644
--- a/hikey960/5.4/snd-soc-simple-card.ko
+++ b/hikey960/5.4/snd-soc-simple-card.ko
Binary files differ
diff --git a/hikey960/5.4/spi-pl022.ko b/hikey960/5.4/spi-pl022.ko
index 520faa5..a07980d 100644
--- a/hikey960/5.4/spi-pl022.ko
+++ b/hikey960/5.4/spi-pl022.ko
Binary files differ
diff --git a/hikey960/5.4/spidev.ko b/hikey960/5.4/spidev.ko
index 8c1ba3e..09f3b9b 100644
--- a/hikey960/5.4/spidev.ko
+++ b/hikey960/5.4/spidev.ko
Binary files differ
diff --git a/hikey960/5.4/syscon-reboot-mode.ko b/hikey960/5.4/syscon-reboot-mode.ko
index 34da951..2f22732 100644
--- a/hikey960/5.4/syscon-reboot-mode.ko
+++ b/hikey960/5.4/syscon-reboot-mode.ko
Binary files differ
diff --git a/hikey960/5.4/system_heap.ko b/hikey960/5.4/system_heap.ko
new file mode 100644
index 0000000..8b5b1ed
--- /dev/null
+++ b/hikey960/5.4/system_heap.ko
Binary files differ
diff --git a/hikey960/5.4/tcpci.ko b/hikey960/5.4/tcpci.ko
index 486094a..b4019b7 100644
--- a/hikey960/5.4/tcpci.ko
+++ b/hikey960/5.4/tcpci.ko
Binary files differ
diff --git a/hikey960/5.4/tcpci_rt1711h.ko b/hikey960/5.4/tcpci_rt1711h.ko
index ff28059..2bc7a2f 100644
--- a/hikey960/5.4/tcpci_rt1711h.ko
+++ b/hikey960/5.4/tcpci_rt1711h.ko
Binary files differ
diff --git a/hikey960/5.4/virt-dma.ko b/hikey960/5.4/virt-dma.ko
index 2bdc3bc..c5942c8 100644
--- a/hikey960/5.4/virt-dma.ko
+++ b/hikey960/5.4/virt-dma.ko
Binary files differ
diff --git a/hikey960/5.4/wl18xx.ko b/hikey960/5.4/wl18xx.ko
index 94d43dc..39f9fe3 100644
--- a/hikey960/5.4/wl18xx.ko
+++ b/hikey960/5.4/wl18xx.ko
Binary files differ
diff --git a/hikey960/5.4/wlcore.ko b/hikey960/5.4/wlcore.ko
index 9574429..3b4b4f2 100644
--- a/hikey960/5.4/wlcore.ko
+++ b/hikey960/5.4/wlcore.ko
Binary files differ
diff --git a/hikey960/5.4/wlcore_sdio.ko b/hikey960/5.4/wlcore_sdio.ko
index b1be2c4..b2f0e80 100644
--- a/hikey960/5.4/wlcore_sdio.ko
+++ b/hikey960/5.4/wlcore_sdio.ko
Binary files differ
diff --git a/hikey960/5.4/xhci-hcd.ko b/hikey960/5.4/xhci-hcd.ko
deleted file mode 100644
index f4bffcd..0000000
--- a/hikey960/5.4/xhci-hcd.ko
+++ /dev/null
Binary files differ
diff --git a/hikey960/5.4/xhci-pci.ko b/hikey960/5.4/xhci-pci.ko
deleted file mode 100644
index c9d485b..0000000
--- a/hikey960/5.4/xhci-pci.ko
+++ /dev/null
Binary files differ
diff --git a/hikey960/5.4/xhci-plat-hcd.ko b/hikey960/5.4/xhci-plat-hcd.ko
deleted file mode 100644
index 0a093c8..0000000
--- a/hikey960/5.4/xhci-plat-hcd.ko
+++ /dev/null
Binary files differ