linux: update rockchip-4.4 to aa8bacf8

packages/linux/package.mk

@@ -35,8 +35,8 @@ case "$LINUX" in
     PKG_BUILD_PERF="no"
     ;;
   rockchip-4.4)
-    PKG_VERSION="bca2464422eb8dd734f9218265dae256a82299be"
+    PKG_VERSION="aa8bacf821e5c8ae6dd8cae8d64011c741659945"
-    PKG_SHA256="baaea04ca4a1b34e0bfce36bfcf74d65b06ae371e29fa2ef96d26327e55b690d"
+    PKG_SHA256="a2760fe89a15aa7be142fd25fb08ebd357c5d855c41f1612cf47c6e89de39bb3"
     PKG_URL="https://github.com/rockchip-linux/kernel/archive/$PKG_VERSION.tar.gz"
     PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz"
     ;;

projects/Rockchip/devices/MiQi/linux/rockchip-4.4/linux.arm.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.4.143 Kernel Configuration
+# Linux/arm 4.4.154 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -1452,6 +1452,7 @@ CONFIG_RT2X00_LIB_LEDS=y
 CONFIG_WL_ROCKCHIP=y
 CONFIG_WIFI_BUILD_MODULE=y
 # CONFIG_WIFI_LOAD_DRIVER_WHEN_KERNEL_BOOTUP is not set
+# CONFIG_WIFI_GENERATE_RANDOM_MAC_ADDR is not set
 # CONFIG_AP6XXX is not set
 # CONFIG_CYW_BCMDHD is not set
 CONFIG_RTL_WIRELESS_SOLUTION=y
@@ -1684,7 +1685,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_YEALINK is not set
 # CONFIG_INPUT_CM109 is not set
 # CONFIG_INPUT_REGULATOR_HAPTIC is not set
-# CONFIG_INPUT_RK8XX_PWRKEY is not set
+CONFIG_INPUT_RK8XX_PWRKEY=y
 CONFIG_INPUT_UINPUT=y
 CONFIG_INPUT_GPIO=y
 # CONFIG_INPUT_PCF8574 is not set
@@ -1783,6 +1784,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 CONFIG_HW_RANDOM_TPM=y
+# CONFIG_HW_RANDOM_ROCKCHIP is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
 CONFIG_TCG_TPM=y
@@ -2445,6 +2447,7 @@ CONFIG_DRM_ROCKCHIP=y
 # CONFIG_ROCKCHIP_CDN_DP is not set
 CONFIG_ROCKCHIP_DW_HDMI=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
+CONFIG_ROCKCHIP_MIPI_CSI_TX=y
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_LVDS=y
@@ -2592,7 +2595,7 @@ CONFIG_RK_VCODEC=y
 #
 # IEP
 #
-# CONFIG_IEP is not set
+CONFIG_IEP=y
 # CONFIG_IEP_MMU is not set
 
 #
@@ -3129,12 +3132,14 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_NET2272 is not set
 # CONFIG_USB_GADGET_XILINX is not set
 # CONFIG_USB_DUMMY_HCD is not set
-CONFIG_USB_LIBCOMPOSITE=y
+CONFIG_USB_LIBCOMPOSITE=m
-CONFIG_USB_F_MASS_STORAGE=y
+CONFIG_USB_F_ACM=m
-CONFIG_USB_F_FS=y
+CONFIG_USB_U_SERIAL=m
-CONFIG_USB_CONFIGFS=y
+CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=m
+CONFIG_USB_CONFIGFS=m
 # CONFIG_USB_CONFIGFS_SERIAL is not set
-# CONFIG_USB_CONFIGFS_ACM is not set
+CONFIG_USB_CONFIGFS_ACM=y
 # CONFIG_USB_CONFIGFS_OBEX is not set
 # CONFIG_USB_CONFIGFS_NCM is not set
 # CONFIG_USB_CONFIGFS_ECM is not set
@@ -3301,6 +3306,7 @@ CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_DRV_HYM8563=y
 # CONFIG_RTC_DRV_MAX6900 is not set
 CONFIG_RTC_DRV_RK808=y
+# CONFIG_RTC_DRV_RK_TIMER is not set
 # CONFIG_RTC_DRV_RS5C372 is not set
 # CONFIG_RTC_DRV_ISL1208 is not set
 # CONFIG_RTC_DRV_ISL12022 is not set
@@ -3611,6 +3617,7 @@ CONFIG_CPU_RK3288=y
 # CONFIG_CPU_RK322X is not set
 # CONFIG_CPU_RV110X is not set
 # CONFIG_CPU_PX30 is not set
+# CONFIG_CPU_RK1808 is not set
 # CONFIG_CPU_RK3308 is not set
 # CONFIG_CPU_RK3328 is not set
 # CONFIG_CPU_RK3366 is not set
@@ -3619,6 +3626,7 @@ CONFIG_CPU_RK3288=y
 CONFIG_ANDROID_VERSION=0x07010000
 CONFIG_ROCKCHIP_CPUINFO=y
 # CONFIG_ROCKCHIP_DEVICEINFO is not set
+CONFIG_ROCKCHIP_OPP=y
 # CONFIG_ROCKCHIP_PM_TEST is not set
 CONFIG_ROCKCHIP_GRF=y
 CONFIG_ROCKCHIP_PM_DOMAINS=y

projects/Rockchip/devices/RK3328/linux/rockchip-4.4/linux.aarch64.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.4.143 Kernel Configuration
+# Linux/arm64 4.4.154 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -12,6 +12,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
 CONFIG_ARM64_PAGE_SHIFT=12
 CONFIG_ARM64_CONT_SHIFT=4
+CONFIG_NO_IOPORT_MAP=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_LOCKDEP_SUPPORT=y
@@ -69,8 +70,6 @@ CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 # CONFIG_IRQ_DOMAIN_DEBUG is not set
 CONFIG_IRQ_FORCED_THREADING=y
@@ -186,7 +185,6 @@ CONFIG_SHMEM=y
 CONFIG_AIO=y
 CONFIG_ADVISE_SYSCALLS=y
 # CONFIG_USERFAULTFD is not set
-CONFIG_PCI_QUIRKS=y
 CONFIG_MEMBARRIER=y
 CONFIG_EMBEDDED=y
 CONFIG_HAVE_PERF_EVENTS=y
@@ -346,38 +344,10 @@ CONFIG_ARCH_ROCKCHIP=y
 #
 # Bus support
 #
-CONFIG_PCI=y
+# CONFIG_PCI is not set
-CONFIG_PCI_DOMAINS=y
+# CONFIG_PCI_DOMAINS is not set
-CONFIG_PCI_DOMAINS_GENERIC=y
+# CONFIG_PCI_DOMAINS_GENERIC is not set
-CONFIG_PCI_SYSCALL=y
+# CONFIG_PCI_SYSCALL is not set
-CONFIG_PCI_BUS_ADDR_T_64BIT=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
-# CONFIG_PCI_STUB is not set
-# CONFIG_PCI_IOV is not set
-# CONFIG_PCI_PRI is not set
-# CONFIG_PCI_PASID is not set
-
-#
-# PCI host controller drivers
-#
-# CONFIG_PCI_HOST_GENERIC is not set
-# CONFIG_PCIE_IPROC is not set
-# CONFIG_PCI_HISI is not set
-CONFIG_PCIE_ROCKCHIP=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_PCIEAER=y
-# CONFIG_PCIE_ECRC is not set
-# CONFIG_PCIEAER_INJECT is not set
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-# CONFIG_PCIEASPM_DEFAULT is not set
-CONFIG_PCIEASPM_POWERSAVE=y
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIE_PME=y
-# CONFIG_HOTPLUG_PCI is not set
 
 #
 # Kernel Features
@@ -1045,13 +1015,11 @@ CONFIG_MTD_CFI_I2=y
 # Mapping drivers for chip access
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
 # CONFIG_MTD_PLATRAM is not set
 
 #
 # Self-contained MTD device drivers
 #
-# CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_DATAFLASH is not set
 CONFIG_MTD_M25P80=y
 # CONFIG_MTD_SST25L is not set
@@ -1081,40 +1049,29 @@ CONFIG_OF=y
 CONFIG_OF_FLATTREE=y
 CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_ADDRESS=y
-CONFIG_OF_ADDRESS_PCI=y
 CONFIG_OF_IRQ=y
 CONFIG_OF_NET=y
 CONFIG_OF_MDIO=y
-CONFIG_OF_PCI=y
-CONFIG_OF_PCI_IRQ=y
 CONFIG_OF_MTD=y
 CONFIG_OF_RESERVED_MEM=y
 # CONFIG_OF_OVERLAY is not set
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
-# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 CONFIG_ZRAM=m
 CONFIG_ZRAM_LZ4_COMPRESS=y
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_DRBD is not set
 # CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_SKD is not set
-# CONFIG_BLK_DEV_SX8 is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=1
 CONFIG_BLK_DEV_RAM_SIZE=4096
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_BLK_DEV_RBD is not set
-# CONFIG_BLK_DEV_RSXX is not set
-CONFIG_BLK_DEV_NVME=y
 
 #
 # Misc devices
@@ -1123,12 +1080,8 @@ CONFIG_ROCKCHIP_SCR=y
 # CONFIG_SENSORS_LIS3LV02D is not set
 # CONFIG_AD525X_DPOT is not set
 # CONFIG_DUMMY_IRQ is not set
-# CONFIG_PHANTOM is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_TIFM_CORE is not set
 # CONFIG_ICS932S401 is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_HP_ILO is not set
 # CONFIG_APDS9802ALS is not set
 # CONFIG_ISL29003 is not set
 # CONFIG_ISL29020 is not set
@@ -1158,7 +1111,6 @@ CONFIG_SRAM=y
 # CONFIG_EEPROM_MAX6875 is not set
 # CONFIG_EEPROM_93CX6 is not set
 # CONFIG_EEPROM_93XX46 is not set
-# CONFIG_CB710_CORE is not set
 
 #
 # Texas Instruments shared transport line discipline
@@ -1195,7 +1147,6 @@ CONFIG_SRAM=y
 #
 # Intel MIC Coprocessor State Management (COSM) Drivers
 #
-# CONFIG_GENWQE is not set
 # CONFIG_ECHO is not set
 # CONFIG_CXL_BASE is not set
 # CONFIG_CXL_KERNEL_API is not set
@@ -1238,47 +1189,8 @@ CONFIG_SCSI_ISCSI_ATTRS=y
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=y
 CONFIG_ISCSI_BOOT_SYSFS=y
-# CONFIG_SCSI_CXGB3_ISCSI is not set
-# CONFIG_SCSI_CXGB4_ISCSI is not set
-# CONFIG_SCSI_BNX2_ISCSI is not set
-# CONFIG_BE2ISCSI is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_HPSA is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_3W_SAS is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_MVUMI is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_SCSI_ESAS2R is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_MPT3SAS is not set
-# CONFIG_SCSI_MPT2SAS is not set
 # CONFIG_SCSI_UFSHCD is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_SNIC is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_AM53C974 is not set
-# CONFIG_SCSI_WD719X is not set
 # CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_PMCRAID is not set
-# CONFIG_SCSI_PM8001 is not set
 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 # CONFIG_SCSI_DH is not set
 # CONFIG_SCSI_OSD_INITIATOR is not set
@@ -1312,20 +1224,12 @@ CONFIG_DM_THIN_PROVISIONING=m
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
 # CONFIG_TARGET_CORE is not set
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_NOSY is not set
 CONFIG_NETDEVICES=y
 CONFIG_MII=y
 CONFIG_NET_CORE=y
 # CONFIG_BONDING is not set
 CONFIG_DUMMY=m
 # CONFIG_EQUALIZER is not set
-# CONFIG_NET_FC is not set
 # CONFIG_NET_TEAM is not set
 CONFIG_MACVLAN=m
 # CONFIG_MACVTAP is not set
@@ -1340,7 +1244,6 @@ CONFIG_TUN=m
 # CONFIG_TUN_VNET_CROSS_LE is not set
 CONFIG_VETH=m
 # CONFIG_NLMON is not set
-# CONFIG_ARCNET is not set
 
 #
 # CAIF transport drivers
@@ -1352,53 +1255,26 @@ CONFIG_VETH=m
 # CONFIG_NET_DSA_MV88E6XXX is not set
 # CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
 CONFIG_ETHERNET=y
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_ADAPTEC is not set
-# CONFIG_NET_VENDOR_AGERE is not set
-# CONFIG_NET_VENDOR_ALTEON is not set
 # CONFIG_ALTERA_TSE is not set
 # CONFIG_NET_VENDOR_AMD is not set
 # CONFIG_NET_VENDOR_ARC is not set
-# CONFIG_NET_VENDOR_ATHEROS is not set
 # CONFIG_NET_VENDOR_AURORA is not set
 # CONFIG_NET_CADENCE is not set
 # CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_BROCADE is not set
-# CONFIG_NET_VENDOR_CAVIUM is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
-# CONFIG_NET_VENDOR_CISCO is not set
 # CONFIG_DNET is not set
-# CONFIG_NET_VENDOR_DEC is not set
-# CONFIG_NET_VENDOR_DLINK is not set
-# CONFIG_NET_VENDOR_EMULEX is not set
 # CONFIG_NET_VENDOR_EZCHIP is not set
-# CONFIG_NET_VENDOR_EXAR is not set
 # CONFIG_NET_VENDOR_HISILICON is not set
-# CONFIG_NET_VENDOR_HP is not set
 # CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_JME is not set
 # CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MELLANOX is not set
 # CONFIG_NET_VENDOR_MICREL is not set
 # CONFIG_NET_VENDOR_MICROCHIP is not set
-# CONFIG_NET_VENDOR_MYRI is not set
-# CONFIG_FEALNX is not set
 # CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_NVIDIA is not set
-# CONFIG_NET_VENDOR_OKI is not set
 # CONFIG_ETHOC is not set
-# CONFIG_NET_PACKET_ENGINE is not set
-# CONFIG_NET_VENDOR_QLOGIC is not set
 # CONFIG_NET_VENDOR_QUALCOMM is not set
-# CONFIG_NET_VENDOR_REALTEK is not set
 # CONFIG_NET_VENDOR_RENESAS is not set
-# CONFIG_NET_VENDOR_RDC is not set
 # CONFIG_NET_VENDOR_ROCKER is not set
 # CONFIG_NET_VENDOR_SAMSUNG is not set
 # CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SILAN is not set
-# CONFIG_NET_VENDOR_SIS is not set
-# CONFIG_SFC is not set
 # CONFIG_NET_VENDOR_SMSC is not set
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=y
@@ -1411,15 +1287,9 @@ CONFIG_DWMAC_ROCKCHIP=y
 # CONFIG_DWMAC_SOCFPGA is not set
 # CONFIG_DWMAC_STI is not set
 # CONFIG_DWMAC_SUNXI is not set
-# CONFIG_STMMAC_PCI is not set
-# CONFIG_NET_VENDOR_SUN is not set
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
-# CONFIG_NET_VENDOR_TEHUTI is not set
-# CONFIG_NET_VENDOR_TI is not set
 # CONFIG_NET_VENDOR_VIA is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
 CONFIG_PHYLIB=y
 
 #
@@ -1498,16 +1368,11 @@ CONFIG_WLAN=y
 CONFIG_LIBERTAS_THINFIRM=y
 # CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
 # CONFIG_LIBERTAS_THINFIRM_USB is not set
-# CONFIG_ATMEL is not set
 # CONFIG_AT76C50X_USB is not set
-# CONFIG_PRISM54 is not set
 CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_RNDIS_WLAN=y
-# CONFIG_ADM8211 is not set
-# CONFIG_RTL8180 is not set
 # CONFIG_RTL8187 is not set
 # CONFIG_MAC80211_HWSIM is not set
-# CONFIG_MWL8K is not set
 # CONFIG_ATH_CARDS is not set
 # CONFIG_B43 is not set
 # CONFIG_B43LEGACY is not set
@@ -1517,23 +1382,12 @@ CONFIG_BRCMFMAC=m
 CONFIG_BRCMFMAC_PROTO_BCDC=y
 # CONFIG_BRCMFMAC_SDIO is not set
 CONFIG_BRCMFMAC_USB=y
-# CONFIG_BRCMFMAC_PCIE is not set
 # CONFIG_BRCM_TRACING is not set
 # CONFIG_BRCMDBG is not set
 # CONFIG_HOSTAP is not set
-# CONFIG_IPW2100 is not set
-# CONFIG_IPW2200 is not set
-# CONFIG_IWLWIFI is not set
-# CONFIG_IWL4965 is not set
-# CONFIG_IWL3945 is not set
 # CONFIG_LIBERTAS is not set
-# CONFIG_HERMES is not set
 # CONFIG_P54_COMMON is not set
 CONFIG_RT2X00=m
-# CONFIG_RT2400PCI is not set
-# CONFIG_RT2500PCI is not set
-# CONFIG_RT61PCI is not set
-# CONFIG_RT2800PCI is not set
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
 CONFIG_RT2800USB=m
@@ -1557,6 +1411,7 @@ CONFIG_RT2X00_LIB_LEDS=y
 CONFIG_WL_ROCKCHIP=y
 CONFIG_WIFI_BUILD_MODULE=y
 # CONFIG_WIFI_LOAD_DRIVER_WHEN_KERNEL_BOOTUP is not set
+# CONFIG_WIFI_GENERATE_RANDOM_MAC_ADDR is not set
 CONFIG_AP6XXX=m
 # CONFIG_CYW_BCMDHD is not set
 CONFIG_RTL_WIRELESS_SOLUTION=y
@@ -1568,7 +1423,6 @@ CONFIG_RTL8723BS=m
 # CONFIG_RTL8723BU is not set
 # CONFIG_RTL8723CS is not set
 # CONFIG_RTL8723DS is not set
-# CONFIG_RTL8822BE is not set
 # CONFIG_MVL88W8977 is not set
 
 #
@@ -1586,7 +1440,6 @@ CONFIG_ZD1211RW=m
 # Enable WiMAX (Networking options) to see the WiMAX drivers
 #
 # CONFIG_WAN is not set
-# CONFIG_VMXNET3 is not set
 # CONFIG_ISDN is not set
 # CONFIG_NVM is not set
 
@@ -1811,7 +1664,6 @@ CONFIG_INPUT_GPIO=y
 CONFIG_SERIO=y
 CONFIG_SERIO_SERPORT=y
 # CONFIG_SERIO_AMBAKMI is not set
-# CONFIG_SERIO_PCIPS2 is not set
 CONFIG_SERIO_LIBPS2=y
 CONFIG_SERIO_RAW=y
 # CONFIG_SERIO_ALTERA_PS2 is not set
@@ -1835,7 +1687,6 @@ CONFIG_UNIX98_PTYS=y
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_NOZOMI is not set
 # CONFIG_N_GSM is not set
 # CONFIG_TRACE_SINK is not set
 CONFIG_DEVMEM=y
@@ -1849,7 +1700,6 @@ CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_DMA=y
-# CONFIG_SERIAL_8250_PCI is not set
 CONFIG_SERIAL_8250_NR_UARTS=5
 CONFIG_SERIAL_8250_RUNTIME_UARTS=5
 CONFIG_SERIAL_8250_EXTENDED=y
@@ -1861,7 +1711,6 @@ CONFIG_SERIAL_8250_FSL=y
 CONFIG_SERIAL_8250_DW=y
 # CONFIG_SERIAL_8250_RT288X is not set
 # CONFIG_SERIAL_8250_INGENIC is not set
-# CONFIG_SERIAL_8250_MID is not set
 
 #
 # Non-8250 serial port support
@@ -1874,7 +1723,6 @@ CONFIG_SERIAL_8250_DW=y
 # CONFIG_SERIAL_UARTLITE is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
-# CONFIG_SERIAL_JSM is not set
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
@@ -1883,7 +1731,6 @@ CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SERIAL_IFX6X60 is not set
 # CONFIG_SERIAL_XILINX_PS_UART is not set
 # CONFIG_SERIAL_ARC is not set
-# CONFIG_SERIAL_RP2 is not set
 # CONFIG_SERIAL_FSL_LPUART is not set
 # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
 # CONFIG_TTY_PRINTK is not set
@@ -1892,8 +1739,8 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 CONFIG_HW_RANDOM_TPM=y
+# CONFIG_HW_RANDOM_ROCKCHIP is not set
 # CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
 
 #
 # PCMCIA character devices
@@ -1903,9 +1750,7 @@ CONFIG_TCG_TPM=y
 # CONFIG_TCG_TIS_I2C_ATMEL is not set
 CONFIG_TCG_TIS_I2C_INFINEON=y
 # CONFIG_TCG_TIS_I2C_NUVOTON is not set
-# CONFIG_TCG_ATMEL is not set
 # CONFIG_TCG_TIS_ST33ZP24 is not set
-CONFIG_DEVPORT=y
 # CONFIG_XILLYBUS is not set
 
 #
@@ -1933,31 +1778,12 @@ CONFIG_I2C_ALGOBIT=y
 # I2C Hardware Bus support
 #
 
-#
-# PC SMBus host controller drivers
-#
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_ISCH is not set
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_NFORCE2 is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
 # CONFIG_I2C_CADENCE is not set
 # CONFIG_I2C_CBUS_GPIO is not set
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
-# CONFIG_I2C_DESIGNWARE_PCI is not set
 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_GPIO is not set
 # CONFIG_I2C_NOMADIK is not set
@@ -2000,7 +1826,6 @@ CONFIG_SPI_BITBANG=y
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PL022 is not set
-# CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_PXA2XX_PCI is not set
 CONFIG_SPI_ROCKCHIP=y
 # CONFIG_SPI_SC18IS602 is not set
@@ -2074,7 +1899,6 @@ CONFIG_GPIO_GENERIC_PLATFORM=y
 # CONFIG_GPIO_GRGPIO is not set
 # CONFIG_GPIO_PL061 is not set
 # CONFIG_GPIO_SYSCON is not set
-# CONFIG_GPIO_VX855 is not set
 # CONFIG_GPIO_XGENE is not set
 # CONFIG_GPIO_XILINX is not set
 # CONFIG_GPIO_ZX is not set
@@ -2096,14 +1920,6 @@ CONFIG_GPIO_GENERIC_PLATFORM=y
 CONFIG_GPIO_RK8XX=y
 # CONFIG_GPIO_TPS6586X is not set
 
-#
-# PCI GPIO expanders
-#
-# CONFIG_GPIO_AMD8111 is not set
-# CONFIG_GPIO_BT8XX is not set
-# CONFIG_GPIO_ML_IOH is not set
-# CONFIG_GPIO_RDC321X is not set
-
 #
 # SPI GPIO expanders
 #
@@ -2193,7 +2009,6 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_DS620 is not set
 # CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_I5K_AMB is not set
 # CONFIG_SENSORS_F71805F is not set
 # CONFIG_SENSORS_F71882FG is not set
 # CONFIG_SENSORS_F75375S is not set
@@ -2257,7 +2072,6 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_SHT15 is not set
 # CONFIG_SENSORS_SHT21 is not set
 # CONFIG_SENSORS_SHTC1 is not set
-# CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_EMC1403 is not set
 # CONFIG_SENSORS_EMC2103 is not set
@@ -2282,9 +2096,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_TMP103 is not set
 # CONFIG_SENSORS_TMP401 is not set
 # CONFIG_SENSORS_TMP421 is not set
-# CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_VT8231 is not set
 # CONFIG_SENSORS_W83781D is not set
 # CONFIG_SENSORS_W83791D is not set
 # CONFIG_SENSORS_W83792D is not set
@@ -2329,17 +2141,9 @@ CONFIG_WATCHDOG=y
 # CONFIG_CADENCE_WATCHDOG is not set
 CONFIG_DW_WATCHDOG=y
 # CONFIG_MAX63XX_WATCHDOG is not set
-# CONFIG_ALIM7101_WDT is not set
-# CONFIG_I6300ESB_WDT is not set
 # CONFIG_BCM7038_WDT is not set
 # CONFIG_MEN_A21_WDT is not set
 
-#
-# PCI-based Watchdog Cards
-#
-# CONFIG_PCIPCWATCHDOG is not set
-# CONFIG_WDTPCI is not set
-
 #
 # USB-based Watchdog Cards
 #
@@ -2385,10 +2189,7 @@ CONFIG_MFD_CROS_EC_SPI=y
 # CONFIG_MFD_HI6421_PMIC is not set
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_HTC_I2CPLD is not set
-# CONFIG_LPC_ICH is not set
-# CONFIG_LPC_SCH is not set
 # CONFIG_INTEL_SOC_PMIC is not set
-# CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
@@ -2407,8 +2208,6 @@ CONFIG_MFD_CROS_EC_SPI=y
 # CONFIG_MFD_VIPERBOARD is not set
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_RDC321X is not set
-# CONFIG_MFD_RTSX_PCI is not set
 # CONFIG_MFD_RT5033 is not set
 # CONFIG_MFD_RTSX_USB is not set
 # CONFIG_MFD_RC5T583 is not set
@@ -2445,7 +2244,6 @@ CONFIG_MFD_TPS6586X=y
 # CONFIG_MFD_LM3533 is not set
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TMIO is not set
-# CONFIG_MFD_VX855 is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA_SPI is not set
 # CONFIG_MFD_WM8400 is not set
@@ -2550,7 +2348,6 @@ CONFIG_MEDIA_USB_SUPPORT=y
 #
 CONFIG_USB_PULSE8_CEC=y
 CONFIG_USB_RAINSHADOW_CEC=y
-# CONFIG_MEDIA_PCI_SUPPORT is not set
 # CONFIG_ROCKCHIP_TSP is not set
 
 #
@@ -2578,7 +2375,6 @@ CONFIG_USB_RAINSHADOW_CEC=y
 #
 # Graphics support
 #
-# CONFIG_VGA_ARB is not set
 CONFIG_DRM=y
 CONFIG_DRM_IGNORE_IOTCL_PERMIT=y
 CONFIG_DRM_MIPI_DSI=y
@@ -2596,20 +2392,13 @@ CONFIG_DRM_FBDEV_EMULATION=y
 # CONFIG_DRM_I2C_CH7006 is not set
 # CONFIG_DRM_I2C_SIL164 is not set
 # CONFIG_DRM_I2C_NXP_TDA998X is not set
-# CONFIG_DRM_TDFX is not set
-# CONFIG_DRM_R128 is not set
-# CONFIG_DRM_RADEON is not set
-# CONFIG_DRM_AMDGPU is not set
-# CONFIG_DRM_NOUVEAU is not set
-# CONFIG_DRM_MGA is not set
-# CONFIG_DRM_VIA is not set
-# CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_VGEM is not set
 CONFIG_DRM_ROCKCHIP=y
 # CONFIG_ROCKCHIP_DRM_DEBUG is not set
 # CONFIG_ROCKCHIP_CDN_DP is not set
 CONFIG_ROCKCHIP_DW_HDMI=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
+CONFIG_ROCKCHIP_MIPI_CSI_TX=y
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_LVDS=y
@@ -2618,11 +2407,6 @@ CONFIG_ROCKCHIP_DRM_TVE=y
 # CONFIG_ROCKCHIP_DRM_BACKLIGHT is not set
 # CONFIG_ROCKCHIP_RK3066_HDMI is not set
 # CONFIG_DRM_UDL is not set
-# CONFIG_DRM_AST is not set
-# CONFIG_DRM_MGAG200 is not set
-# CONFIG_DRM_CIRRUS_QEMU is not set
-# CONFIG_DRM_QXL is not set
-# CONFIG_DRM_BOCHS is not set
 CONFIG_DRM_PANEL=y
 
 #
@@ -2693,45 +2477,19 @@ CONFIG_FB_SYS_FOPS=y
 #
 # Frame buffer hardware drivers
 #
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
 # CONFIG_FB_ARMCLCD is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
 # CONFIG_FB_UVESA is not set
 # CONFIG_FB_OPENCORES is not set
 # CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_I740 is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
 # CONFIG_FB_SMSCUFX is not set
 # CONFIG_FB_UDL is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
 # CONFIG_FB_BROADSHEET is not set
 # CONFIG_FB_AUO_K190X is not set
 # CONFIG_FB_SIMPLE is not set
 # CONFIG_FB_SSD1307 is not set
-# CONFIG_FB_SM712 is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_LCD_CLASS_DEVICE is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -2775,7 +2533,7 @@ CONFIG_RK_VCODEC=y
 #
 # IEP
 #
-# CONFIG_IEP is not set
+CONFIG_IEP=y
 # CONFIG_IEP_MMU is not set
 
 #
@@ -2839,7 +2597,6 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_MTPAV is not set
 # CONFIG_SND_SERIAL_U16550 is not set
 # CONFIG_SND_MPU401 is not set
-# CONFIG_SND_PCI is not set
 
 #
 # HD-Audio
@@ -3118,12 +2875,10 @@ CONFIG_USB_MON=y
 #
 # CONFIG_USB_C67X00_HCD is not set
 CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_XHCI_PCI=y
 CONFIG_USB_XHCI_PLATFORM=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_PCI=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
@@ -3131,9 +2886,7 @@ CONFIG_USB_EHCI_HCD_PLATFORM=y
 # CONFIG_USB_FOTG210_HCD is not set
 # CONFIG_USB_MAX3421_HCD is not set
 CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_HCD_PCI is not set
 CONFIG_USB_OHCI_HCD_PLATFORM=y
-# CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_HCD_TEST_MODE is not set
@@ -3185,7 +2938,6 @@ CONFIG_USB_DWC3_DUAL_ROLE=y
 #
 # Platform Glue Driver Support
 #
-# CONFIG_USB_DWC3_PCI is not set
 CONFIG_USB_DWC3_OF_SIMPLE=y
 CONFIG_USB_DWC3_ROCKCHIP=y
 CONFIG_USB_DWC3_ROCKCHIP_INNO=y
@@ -3197,7 +2949,6 @@ CONFIG_USB_DWC2=y
 #
 # CONFIG_USB_DWC2_PERIPHERAL is not set
 CONFIG_USB_DWC2_DUAL_ROLE=y
-# CONFIG_USB_DWC2_PCI is not set
 # CONFIG_USB_DWC2_DEBUG is not set
 # CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
 # CONFIG_USB_CHIPIDEA is not set
@@ -3329,19 +3080,15 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_MV_U3D is not set
 # CONFIG_USB_M66592 is not set
 # CONFIG_USB_BDC_UDC is not set
-# CONFIG_USB_AMD5536UDC is not set
 # CONFIG_USB_NET2272 is not set
-# CONFIG_USB_NET2280 is not set
-# CONFIG_USB_GOKU is not set
-# CONFIG_USB_EG20T is not set
 # CONFIG_USB_GADGET_XILINX is not set
 # CONFIG_USB_DUMMY_HCD is not set
-CONFIG_USB_LIBCOMPOSITE=y
+CONFIG_USB_LIBCOMPOSITE=m
-CONFIG_USB_F_ACM=y
+CONFIG_USB_F_ACM=m
-CONFIG_USB_U_SERIAL=y
+CONFIG_USB_U_SERIAL=m
-CONFIG_USB_F_MASS_STORAGE=y
+CONFIG_USB_F_MASS_STORAGE=m
-CONFIG_USB_F_FS=y
+CONFIG_USB_F_FS=m
-CONFIG_USB_CONFIGFS=y
+CONFIG_USB_CONFIGFS=m
 # CONFIG_USB_CONFIGFS_SERIAL is not set
 CONFIG_USB_CONFIGFS_ACM=y
 # CONFIG_USB_CONFIGFS_OBEX is not set
@@ -3406,25 +3153,19 @@ CONFIG_MMC_TEST=y
 #
 # CONFIG_MMC_ARMMMCI is not set
 CONFIG_MMC_SDHCI=y
-# CONFIG_MMC_SDHCI_PCI is not set
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_OF_ARASAN=y
 # CONFIG_MMC_SDHCI_OF_AT91 is not set
 # CONFIG_MMC_SDHCI_F_SDH30 is not set
-# CONFIG_MMC_TIFM_SD is not set
 # CONFIG_MMC_SPI is not set
-# CONFIG_MMC_CB710 is not set
-# CONFIG_MMC_VIA_SDMMC is not set
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_PLTFM=y
 # CONFIG_MMC_DW_EXYNOS is not set
 # CONFIG_MMC_DW_K3 is not set
-# CONFIG_MMC_DW_PCI is not set
 CONFIG_MMC_DW_ROCKCHIP=y
 # CONFIG_MMC_VUB300 is not set
 # CONFIG_MMC_USHC is not set
 # CONFIG_MMC_USDHI6ROL0 is not set
-# CONFIG_MMC_TOSHIBA_PCI is not set
 # CONFIG_MMC_MTK is not set
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
@@ -3484,7 +3225,6 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 # CONFIG_LEDS_TRIGGER_MULTI_CTRL is not set
 # CONFIG_SWITCH is not set
 # CONFIG_ACCESSIBILITY is not set
-# CONFIG_INFINIBAND is not set
 CONFIG_EDAC_SUPPORT=y
 # CONFIG_EDAC is not set
 CONFIG_RTC_LIB=y
@@ -3517,6 +3257,7 @@ CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_DRV_HYM8563=y
 # CONFIG_RTC_DRV_MAX6900 is not set
 CONFIG_RTC_DRV_RK808=y
+# CONFIG_RTC_DRV_RK_TIMER is not set
 # CONFIG_RTC_DRV_RS5C372 is not set
 # CONFIG_RTC_DRV_ISL1208 is not set
 # CONFIG_RTC_DRV_ISL12022 is not set
@@ -3598,7 +3339,6 @@ CONFIG_DMA_OF=y
 # CONFIG_INTEL_IDMA64 is not set
 CONFIG_PL330_DMA=y
 # CONFIG_DW_DMAC is not set
-# CONFIG_DW_DMAC_PCI is not set
 
 #
 # DMA Clients
@@ -3613,7 +3353,6 @@ CONFIG_PL330_DMA=y
 #
 # Virtio drivers
 #
-# CONFIG_VIRTIO_PCI is not set
 # CONFIG_VIRTIO_MMIO is not set
 
 #
@@ -3622,13 +3361,10 @@ CONFIG_PL330_DMA=y
 CONFIG_STAGING=y
 # CONFIG_PRISM2_USB is not set
 # CONFIG_COMEDI is not set
-# CONFIG_RTL8192U is not set
 # CONFIG_RTLLIB is not set
 # CONFIG_R8712U is not set
 # CONFIG_R8188EU is not set
 # CONFIG_R8723AU is not set
-# CONFIG_RTS5208 is not set
-# CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
 
 #
@@ -3720,8 +3456,6 @@ CONFIG_TSL2583=y
 #
 # CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set
 # CONFIG_IIO_SIMPLE_DUMMY is not set
-# CONFIG_FB_SM750 is not set
-# CONFIG_FB_XGI is not set
 
 #
 # Speakup console speech
@@ -3737,7 +3471,6 @@ CONFIG_TSL2583=y
 # CONFIG_ANDROID_TIMED_OUTPUT is not set
 # CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
 # CONFIG_SYNC is not set
-# CONFIG_ANDROID_VSOC is not set
 # CONFIG_ION is not set
 # CONFIG_FIQ_DEBUGGER is not set
 # CONFIG_FIQ_WATCHDOG is not set
@@ -3746,7 +3479,6 @@ CONFIG_TSL2583=y
 # CONFIG_WIMAX_GDM72XX is not set
 # CONFIG_LTE_GDM724X is not set
 # CONFIG_LUSTRE_FS is not set
-# CONFIG_DGNC is not set
 # CONFIG_DGAP is not set
 # CONFIG_GS_FPGABOOT is not set
 # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
@@ -3816,7 +3548,6 @@ CONFIG_IOMMU_DMA=y
 CONFIG_ROCKCHIP_IOMMU=y
 # CONFIG_RK_IOMMU is not set
 # CONFIG_ARM_SMMU is not set
-# CONFIG_ARM_SMMU_V3 is not set
 
 #
 # Remoteproc drivers
@@ -3835,6 +3566,7 @@ CONFIG_ROCKCHIP_IOMMU=y
 # CPU selection
 #
 # CONFIG_CPU_PX30 is not set
+# CONFIG_CPU_RK1808 is not set
 # CONFIG_CPU_RK3308 is not set
 CONFIG_CPU_RK3328=y
 # CONFIG_CPU_RK3366 is not set
@@ -3843,6 +3575,7 @@ CONFIG_CPU_RK3328=y
 CONFIG_ANDROID_VERSION=0x07010000
 CONFIG_ROCKCHIP_CPUINFO=y
 # CONFIG_ROCKCHIP_DEVICEINFO is not set
+CONFIG_ROCKCHIP_OPP=y
 # CONFIG_ROCKCHIP_PM_TEST is not set
 CONFIG_ROCKCHIP_GRF=y
 CONFIG_ROCKCHIP_PM_DOMAINS=y
@@ -4092,8 +3825,6 @@ CONFIG_IIO_SYSFS_TRIGGER=y
 # CONFIG_TMP006 is not set
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
-# CONFIG_NTB is not set
-# CONFIG_VME_BUS is not set
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
 # CONFIG_PWM_CROS_EC is not set
@@ -4104,9 +3835,7 @@ CONFIG_PWM_ROCKCHIP=y
 # CONFIG_PWM_ROCKCHIP_I2S is not set
 CONFIG_IRQCHIP=y
 CONFIG_ARM_GIC=y
-CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3=y
-CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_PARTITION_PERCPU=y
 # CONFIG_IPACK_BUS is not set
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
@@ -4130,7 +3859,7 @@ CONFIG_PHY_ROCKCHIP_DP=y
 # CONFIG_PHY_ROCKCHIP_INNO_MIPI_DPHY is not set
 CONFIG_PHY_ROCKCHIP_INNO_HDMI_PHY=y
 CONFIG_PHY_ROCKCHIP_TYPEC=y
-CONFIG_PHY_ROCKCHIP_PCIE=y
+# CONFIG_PHY_ROCKCHIP_PCIE is not set
 # CONFIG_POWERCAP is not set
 # CONFIG_MCB is not set
 
@@ -4139,7 +3868,6 @@ CONFIG_PHY_ROCKCHIP_PCIE=y
 #
 CONFIG_ARM_PMU=y
 CONFIG_RAS=y
-# CONFIG_THUNDERBOLT is not set
 
 #
 # Android
@@ -4173,7 +3901,6 @@ CONFIG_ARM_PSCI_FW=y
 # CONFIG_FIRMWARE_MEMMAP is not set
 CONFIG_HAVE_ARM_SMCCC=y
 CONFIG_ROCKCHIP_SIP=y
-# CONFIG_ACPI is not set
 
 #
 # File systems
@@ -4836,7 +4563,6 @@ CONFIG_DECOMPRESS_XZ=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y

projects/Rockchip/devices/RK3328/options

@@ -37,4 +37,8 @@
     MALI_FAMILY="450"
 
   # kernel serial console
-    EXTRA_CMDLINE="console=uart8250,mmio32,0xff130000 console=tty0"
+    if [ "$UBOOT_SYSTEM" = "box-trn9" ]; then
+      EXTRA_CMDLINE="console=tty0"
+    else
+      EXTRA_CMDLINE="console=uart8250,mmio32,0xff130000 console=tty0"
+    fi

projects/Rockchip/devices/RK3399/linux/rockchip-4.4/linux.aarch64.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.4.143 Kernel Configuration
+# Linux/arm64 4.4.154 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -1557,6 +1557,7 @@ CONFIG_RT2X00_LIB_LEDS=y
 CONFIG_WL_ROCKCHIP=y
 CONFIG_WIFI_BUILD_MODULE=y
 # CONFIG_WIFI_LOAD_DRIVER_WHEN_KERNEL_BOOTUP is not set
+# CONFIG_WIFI_GENERATE_RANDOM_MAC_ADDR is not set
 CONFIG_AP6XXX=m
 # CONFIG_CYW_BCMDHD is not set
 CONFIG_RTL_WIRELESS_SOLUTION=y
@@ -1892,6 +1893,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 CONFIG_HW_RANDOM_TPM=y
+# CONFIG_HW_RANDOM_ROCKCHIP is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 
@@ -2610,6 +2612,7 @@ CONFIG_DRM_ROCKCHIP=y
 CONFIG_ROCKCHIP_CDN_DP=y
 CONFIG_ROCKCHIP_DW_HDMI=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
+CONFIG_ROCKCHIP_MIPI_CSI_TX=y
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_LVDS=y
@@ -2781,7 +2784,7 @@ CONFIG_RK_VCODEC=y
 #
 # IEP
 #
-# CONFIG_IEP is not set
+CONFIG_IEP=y
 # CONFIG_IEP_MMU is not set
 
 #
@@ -3342,12 +3345,12 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_EG20T is not set
 # CONFIG_USB_GADGET_XILINX is not set
 # CONFIG_USB_DUMMY_HCD is not set
-CONFIG_USB_LIBCOMPOSITE=y
+CONFIG_USB_LIBCOMPOSITE=m
-CONFIG_USB_F_ACM=y
+CONFIG_USB_F_ACM=m
-CONFIG_USB_U_SERIAL=y
+CONFIG_USB_U_SERIAL=m
-CONFIG_USB_F_MASS_STORAGE=y
+CONFIG_USB_F_MASS_STORAGE=m
-CONFIG_USB_F_FS=y
+CONFIG_USB_F_FS=m
-CONFIG_USB_CONFIGFS=y
+CONFIG_USB_CONFIGFS=m
 # CONFIG_USB_CONFIGFS_SERIAL is not set
 CONFIG_USB_CONFIGFS_ACM=y
 # CONFIG_USB_CONFIGFS_OBEX is not set
@@ -3523,6 +3526,7 @@ CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_DRV_HYM8563=y
 # CONFIG_RTC_DRV_MAX6900 is not set
 CONFIG_RTC_DRV_RK808=y
+# CONFIG_RTC_DRV_RK_TIMER is not set
 # CONFIG_RTC_DRV_RS5C372 is not set
 # CONFIG_RTC_DRV_ISL1208 is not set
 # CONFIG_RTC_DRV_ISL12022 is not set
@@ -3841,6 +3845,7 @@ CONFIG_ROCKCHIP_IOMMU=y
 # CPU selection
 #
 # CONFIG_CPU_PX30 is not set
+# CONFIG_CPU_RK1808 is not set
 # CONFIG_CPU_RK3308 is not set
 # CONFIG_CPU_RK3328 is not set
 # CONFIG_CPU_RK3366 is not set
@@ -3849,6 +3854,7 @@ CONFIG_CPU_RK3399=y
 CONFIG_ANDROID_VERSION=0x07010000
 CONFIG_ROCKCHIP_CPUINFO=y
 # CONFIG_ROCKCHIP_DEVICEINFO is not set
+CONFIG_ROCKCHIP_OPP=y
 # CONFIG_ROCKCHIP_PM_TEST is not set
 CONFIG_ROCKCHIP_GRF=y
 CONFIG_ROCKCHIP_PM_DOMAINS=y

projects/Rockchip/devices/TinkerBoard/linux/rockchip-4.4/linux.arm.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.4.143 Kernel Configuration
+# Linux/arm 4.4.154 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -1452,6 +1452,7 @@ CONFIG_RT2X00_LIB_LEDS=y
 CONFIG_WL_ROCKCHIP=y
 CONFIG_WIFI_BUILD_MODULE=y
 # CONFIG_WIFI_LOAD_DRIVER_WHEN_KERNEL_BOOTUP is not set
+# CONFIG_WIFI_GENERATE_RANDOM_MAC_ADDR is not set
 # CONFIG_AP6XXX is not set
 # CONFIG_CYW_BCMDHD is not set
 CONFIG_RTL_WIRELESS_SOLUTION=y
@@ -1684,7 +1685,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_YEALINK is not set
 # CONFIG_INPUT_CM109 is not set
 # CONFIG_INPUT_REGULATOR_HAPTIC is not set
-# CONFIG_INPUT_RK8XX_PWRKEY is not set
+CONFIG_INPUT_RK8XX_PWRKEY=y
 CONFIG_INPUT_UINPUT=y
 CONFIG_INPUT_GPIO=y
 # CONFIG_INPUT_PCF8574 is not set
@@ -1783,6 +1784,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 CONFIG_HW_RANDOM_TPM=y
+# CONFIG_HW_RANDOM_ROCKCHIP is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
 CONFIG_TCG_TPM=y
@@ -2445,6 +2447,7 @@ CONFIG_DRM_ROCKCHIP=y
 # CONFIG_ROCKCHIP_CDN_DP is not set
 CONFIG_ROCKCHIP_DW_HDMI=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
+CONFIG_ROCKCHIP_MIPI_CSI_TX=y
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_LVDS=y
@@ -2592,7 +2595,7 @@ CONFIG_RK_VCODEC=y
 #
 # IEP
 #
-# CONFIG_IEP is not set
+CONFIG_IEP=y
 # CONFIG_IEP_MMU is not set
 
 #
@@ -3129,12 +3132,14 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_NET2272 is not set
 # CONFIG_USB_GADGET_XILINX is not set
 # CONFIG_USB_DUMMY_HCD is not set
-CONFIG_USB_LIBCOMPOSITE=y
+CONFIG_USB_LIBCOMPOSITE=m
-CONFIG_USB_F_MASS_STORAGE=y
+CONFIG_USB_F_ACM=m
-CONFIG_USB_F_FS=y
+CONFIG_USB_U_SERIAL=m
-CONFIG_USB_CONFIGFS=y
+CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=m
+CONFIG_USB_CONFIGFS=m
 # CONFIG_USB_CONFIGFS_SERIAL is not set
-# CONFIG_USB_CONFIGFS_ACM is not set
+CONFIG_USB_CONFIGFS_ACM=y
 # CONFIG_USB_CONFIGFS_OBEX is not set
 # CONFIG_USB_CONFIGFS_NCM is not set
 # CONFIG_USB_CONFIGFS_ECM is not set
@@ -3301,6 +3306,7 @@ CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_DRV_HYM8563=y
 # CONFIG_RTC_DRV_MAX6900 is not set
 CONFIG_RTC_DRV_RK808=y
+# CONFIG_RTC_DRV_RK_TIMER is not set
 # CONFIG_RTC_DRV_RS5C372 is not set
 # CONFIG_RTC_DRV_ISL1208 is not set
 # CONFIG_RTC_DRV_ISL12022 is not set
@@ -3611,6 +3617,7 @@ CONFIG_CPU_RK3288=y
 # CONFIG_CPU_RK322X is not set
 # CONFIG_CPU_RV110X is not set
 # CONFIG_CPU_PX30 is not set
+# CONFIG_CPU_RK1808 is not set
 # CONFIG_CPU_RK3308 is not set
 # CONFIG_CPU_RK3328 is not set
 # CONFIG_CPU_RK3366 is not set
@@ -3619,6 +3626,7 @@ CONFIG_CPU_RK3288=y
 CONFIG_ANDROID_VERSION=0x07010000
 CONFIG_ROCKCHIP_CPUINFO=y
 # CONFIG_ROCKCHIP_DEVICEINFO is not set
+CONFIG_ROCKCHIP_OPP=y
 # CONFIG_ROCKCHIP_PM_TEST is not set
 CONFIG_ROCKCHIP_GRF=y
 CONFIG_ROCKCHIP_PM_DOMAINS=y

projects/Rockchip/patches/linux/rockchip-4.4/linux-0001-rockchip.patch

@@ -1,4 +1,4 @@
-From 00ddf696ea9a7e980ea8e6ff895defe392db0c11 Mon Sep 17 00:00:00 2001
+From 92b97663794c1ad57aaf7e66ee418bfce635a494 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 17 Apr 2017 13:09:16 +0200
 Subject: [PATCH] sound/usb/quirks-table: add Realtek ALC4040
@@ -26,7 +26,7 @@ index 69bf5cf1e91e..00672a818145 100644
 +
  #undef USB_DEVICE_VENDOR_SPEC
 
-From 55a67a2125f372eed3281cec9914ecd66283955b Mon Sep 17 00:00:00 2001
+From 61382c4e328df487f69b2095865c2e9e2c9e4121 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 28 May 2017 09:08:50 +0200
 Subject: [PATCH] gpu/arm/mali400: default to performance gpu governor
@@ -49,7 +49,7 @@ index c9b8652f100d..6c97c530a2ae 100644
  		mali_devfreq_term_freq_table(mdev);
  		return PTR_ERR(mdev->devfreq);
 
-From 188e9f097216cd73fa78abf9545837464dd70231 Mon Sep 17 00:00:00 2001
+From 0fcd82216c0161c9dd6b54ee505988c539df91fb Mon Sep 17 00:00:00 2001
 From: LongChair <LongChair@hotmail.com>
 Date: Fri, 21 Apr 2017 13:39:12 +0200
 Subject: [PATCH] drm/rockchip: remove unsupported 4K freqs
@@ -80,7 +80,7 @@ index a58edabe600c..7273561fe6b1 100644
  	 * ensure all drm display mode can work, if someone want support more
  	 * resolutions, please limit the possible_crtc, only connect to
 
-From cde112e9f9e564806b49bbe317b783e78a6b5c3a Mon Sep 17 00:00:00 2001
+From 28e3e0508d53dd697fc3dd75588bba08adee1bb0 Mon Sep 17 00:00:00 2001
 From: xuhuicong <xhc@rock-chips.com>
 Date: Fri, 23 Jun 2017 18:56:17 +0800
 Subject: [PATCH] drm/rockchip: hdmi: fix no sound some time
@@ -92,7 +92,7 @@ Signed-off-by: xuhuicong <xhc@rock-chips.com>
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index d57d999c50a5..ae498d097b61 100644
+index 8cb2cb4e61a6..30b6bd979eb8 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -1991,10 +1991,6 @@ static void hdmi_av_composer(struct dw_hdmi *hdmi,
@@ -117,7 +117,7 @@ index d57d999c50a5..ae498d097b61 100644
  		/* HDMI Initialization Step F - Configure AVI InfoFrame */
  		hdmi_config_AVI(hdmi, mode);
 
-From e56478758d232f503414c1e004f6f52973aeb0c4 Mon Sep 17 00:00:00 2001
+From 16f51adab10ab06bfecbd0ed9e444329debb426d Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 18 Nov 2017 11:09:39 +0100
 Subject: [PATCH] rockchip: vop: force skip lines if image too big
@@ -127,10 +127,10 @@ Subject: [PATCH] rockchip: vop: force skip lines if image too big
  1 file changed, 10 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
-index a2c1d85bba95..784e83537692 100644
+index 76610608c723..1418402c2668 100644
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
-@@ -1649,6 +1649,7 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
+@@ -1653,6 +1653,7 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
  	int ymirror, xmirror;
  	uint32_t val;
  	bool rb_swap, global_alpha_en;
@@ -138,7 +138,7 @@ index a2c1d85bba95..784e83537692 100644
  
  #if defined(CONFIG_ROCKCHIP_DRM_DEBUG)
  	bool AFBC_flag = false;
-@@ -1685,8 +1686,14 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
+@@ -1689,8 +1690,14 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
  	}
  
  	mode = &crtc->state->adjusted_mode;
@@ -154,13 +154,15 @@ index a2c1d85bba95..784e83537692 100644
  	act_info = (actual_h - 1) << 16 | ((actual_w - 1) & 0xffff);
  
  	dsp_info = (drm_rect_height(dest) - 1) << 16;
-@@ -1708,10 +1715,10 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
+@@ -1727,12 +1734,12 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
  	VOP_WIN_SET(vop, win, xmirror, xmirror);
  	VOP_WIN_SET(vop, win, ymirror, ymirror);
  	VOP_WIN_SET(vop, win, format, vop_plane_state->format);
 -	VOP_WIN_SET(vop, win, yrgb_vir, fb->pitches[0] >> 2);
 +	VOP_WIN_SET(vop, win, yrgb_vir, fb->pitches[0] >> (2 - skip_lines));
  	VOP_WIN_SET(vop, win, yrgb_mst, vop_plane_state->yrgb_mst);
+ 	VOP_WIN_SET(vop, win, yrgb_mst1, vop_plane_state->yrgb_mst);
+ 
  	if (is_yuv_support(fb->pixel_format)) {
 -		VOP_WIN_SET(vop, win, uv_vir, fb->pitches[1] >> 2);
 +		VOP_WIN_SET(vop, win, uv_vir, fb->pitches[1] >> (2 - skip_lines));
@@ -168,7 +170,7 @@ index a2c1d85bba95..784e83537692 100644
  	}
  	VOP_WIN_SET(vop, win, fmt_10, is_yuv_10bit(fb->pixel_format));
 
-From d1cc2fb593abab7510948339db9cf4b9a59926c6 Mon Sep 17 00:00:00 2001
+From d56d2c8dcd6dc828693bed0cf965d68e90431019 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 18 Nov 2017 23:17:24 +0100
 Subject: [PATCH] gpu/arm/midgard: default to performance gpu governor
@@ -216,7 +218,7 @@ index 1cf44b3500cf..a6a1a52f0463 100644
  /*
   * Power Management poweroff tick granuality. This is in nanoseconds to
 
-From fd3c597dd56bca81fc642d918343ab2f9435628f Mon Sep 17 00:00:00 2001
+From 955a2a87c8fa737d78c022afef1ed32fd6f06760 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 10 Dec 2017 14:16:09 +0100
 Subject: [PATCH] uapi: install rockchip_drm header
@@ -238,7 +240,7 @@ index 38d437096c35..b7ae9969d41e 100644
  header-y += sis_drm.h
  header-y += tegra_drm.h
 
-From b5afb970037ac69a22f6d514c34175835f6078fc Mon Sep 17 00:00:00 2001
+From b4da8f58954748a2d459d5e480156ee2703ea169 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 10 Dec 2017 18:03:53 +0100
 Subject: [PATCH] phy: rockchip-inno-hdmi-phy: add vesa dmt pixel clocks
@@ -323,7 +325,7 @@ index 0161f80ab964..6cf391405ad6 100644
  };
  
 
-From 0377b8c27f4b56b0b6f1fc8af11cde6ab8517c3b Mon Sep 17 00:00:00 2001
+From f3f9dc1c2c697f0c9fefd501731a07ef64a026b1 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Tue, 12 Dec 2017 00:37:27 +0100
 Subject: [PATCH] clk: rockchip: fix round rate
@@ -333,10 +335,10 @@ Subject: [PATCH] clk: rockchip: fix round rate
  1 file changed, 11 insertions(+)
 
 diff --git a/drivers/clk/rockchip/clk-pll.c b/drivers/clk/rockchip/clk-pll.c
-index addcdb07553a..e3d7a9ee1078 100644
+index 0a9f31f2dd27..183114d824a7 100644
 --- a/drivers/clk/rockchip/clk-pll.c
 +++ b/drivers/clk/rockchip/clk-pll.c
-@@ -356,6 +356,17 @@ static const struct rockchip_pll_rate_table *rockchip_get_pll_settings(
+@@ -364,6 +364,17 @@ static const struct rockchip_pll_rate_table *rockchip_get_pll_settings(
  static long rockchip_pll_round_rate(struct clk_hw *hw,
  			    unsigned long drate, unsigned long *prate)
  {
@@ -355,7 +357,7 @@ index addcdb07553a..e3d7a9ee1078 100644
  }
  
 
-From c4bc7e7f44f76a7f6f2374956fd68cab657f1eb3 Mon Sep 17 00:00:00 2001
+From 5a5f5ea8edcc75ca49961a458ac0380e60f30a4d Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 21 Jan 2018 17:20:00 +0100
 Subject: [PATCH] drm: fix HDR metadata infoframe length
@@ -372,7 +374,7 @@ Fixes activation of HDR mode on my LG OLED
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index ae498d097b61..018bef374dc3 100644
+index 30b6bd979eb8..ec002a4a7a7d 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -1857,7 +1857,7 @@ static void hdmi_config_hdr_infoframe(struct dw_hdmi *hdmi)
@@ -402,7 +404,7 @@ index bfe671071d9f..e3a0f561e8f0 100644
  	for (i = 0; i < 3; i++) {
  		frame->display_primaries_x[i] =
 
-From 3b4e87792660182b9f0093e016d41a7be53fe59e Mon Sep 17 00:00:00 2001
+From 939878193c4447665bb3b1249e322a5840fbc2d2 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 27 Jan 2018 09:39:09 +0100
 Subject: [PATCH] drm: add edid detection for Hybrid Log-Gamma EOTF
@@ -434,7 +436,7 @@ index e3a0f561e8f0..f7d41950614e 100644
  	return val;
  }
 
-From a11ad9338755a57859c7ca1b54b7719fb644a5ef Mon Sep 17 00:00:00 2001
+From 19e9d690fe47e5e4b47760d060b11707bb44194b Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 11 Feb 2018 19:21:41 +0100
 Subject: [PATCH] drm: bridge: dw-hdmi: default to underscan mode
@@ -444,7 +446,7 @@ Subject: [PATCH] drm: bridge: dw-hdmi: default to underscan mode
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index 018bef374dc3..d0866baa75fc 100644
+index ec002a4a7a7d..393bd5b28f07 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -1691,7 +1691,7 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode)
@@ -457,7 +459,7 @@ index 018bef374dc3..d0866baa75fc 100644
  	/*
  	 * The Designware IP uses a different byte format from standard
 
-From cb40442a2cd891541ac55381a2610f61f9d56fa9 Mon Sep 17 00:00:00 2001
+From b492ddc8ae2777350db224d39346966080a140d6 Mon Sep 17 00:00:00 2001
 From: David Carrillo-Cisneros <davidcc@google.com>
 Date: Tue, 18 Jul 2017 18:18:37 -0700
 Subject: [PATCH] UPSTREAM: perf tools: Add EXCLUDE_EXTLIBS and EXTRA_PERFLIBS
@@ -517,19 +519,19 @@ index fb1c9ddc3478..9b3b9bd50d54 100644
  export INSTALL SHELL_PATH
  
 
-From 6f95e5cdd43756df0bc1caa983f0f326a38bb9ff Mon Sep 17 00:00:00 2001
+From 163448e6d6d5d0bbc9486d43a2d06c5d86e28d34 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Tue, 27 Feb 2018 20:49:00 +0100
 Subject: [PATCH] net: wireless: rockchip_wlan: rtl8723bs: do not accept all
  sdio wlan id
 
 ---
- drivers/net/wireless/rockchip_wlan/rtl8723bs/Makefile                 | 2 +-
+ drivers/net/wireless/rockchip_wlan/rtl8723bs/Makefile             | 2 +-
- drivers/net/wireless/rockchip_wlan/rtl8723bs/os_dep/linux/sdio_intf.c | 3 +++
+ .../net/wireless/rockchip_wlan/rtl8723bs/os_dep/linux/sdio_intf.c | 8 ++++++++
- 2 files changed, 4 insertions(+), 1 deletion(-)
+ 2 files changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/Makefile b/drivers/net/wireless/rockchip_wlan/rtl8723bs/Makefile
-index 0ff707fd37eb..ca79c18b8eb8 100644
+index fe9d5638a128..e8653b070efb 100644
 --- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/Makefile
 +++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/Makefile
 @@ -1347,7 +1347,7 @@ EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFO
@@ -542,21 +544,26 @@ index 0ff707fd37eb..ca79c18b8eb8 100644
  EXTRA_CFLAGS += -DCONFIG_RESUME_IN_WORKQUEUE
  # default setting for Special function
 diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/os_dep/linux/sdio_intf.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs/os_dep/linux/sdio_intf.c
-index b4654d229634..48b6cf61d436 100644
+index b4654d229634..e49e5cb8f21a 100644
 --- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/os_dep/linux/sdio_intf.c
 +++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/os_dep/linux/sdio_intf.c
-@@ -45,6 +45,9 @@ static struct mmc_host *mmc_host = NULL;
+@@ -45,6 +45,14 @@ static struct mmc_host *mmc_host = NULL;
  
  static const struct sdio_device_id sdio_ids[] = {
  #ifdef CONFIG_RTL8723B
++	{ SDIO_DEVICE(0x024c, 0x0240), .driver_data = RTL8723B},
++	{ SDIO_DEVICE(0x024c, 0x0241), .driver_data = RTL8723B},
 +	{ SDIO_DEVICE(0x024c, 0x0523), .driver_data = RTL8723B},
++	{ SDIO_DEVICE(0x024c, 0x0524), .driver_data = RTL8723B},
 +	{ SDIO_DEVICE(0x024c, 0x0623), .driver_data = RTL8723B},
++	{ SDIO_DEVICE(0x024c, 0x0624), .driver_data = RTL8723B},
 +	{ SDIO_DEVICE(0x024c, 0x0626), .driver_data = RTL8723B},
++	{ SDIO_DEVICE(0x024c, 0x8753), .driver_data = RTL8723B},
  	{ SDIO_DEVICE(0x024c, 0xB723), .driver_data = RTL8723B},
  #endif
  #ifdef CONFIG_RTL8188E
 
-From 157645ba1282857bf4440707620c9ca91d8f8913 Mon Sep 17 00:00:00 2001
+From ba7c1fb0efcf29265c0c88d98f52919a21078e5b Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Fri, 2 Mar 2018 20:53:32 +0100
 Subject: [PATCH] net: wireless: rockchip_wlan: bcmdhd: detect broadcom sdio
@@ -580,7 +587,7 @@ index 8864582b1706..b5a388cc3cbe 100755
  	},
  };
 
-From 00c9d5749537dacbd745ce3456f1335cbe019d54 Mon Sep 17 00:00:00 2001
+From 088790f59f74dc73cde328bb1751c75b1cdbd7a0 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 1 Jul 2018 23:17:47 +0200
 Subject: [PATCH] drm/rockchip: clip yuv
@@ -592,18 +599,18 @@ Subject: [PATCH] drm/rockchip: clip yuv
  3 files changed, 7 insertions(+)
 
 diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
-index 784e83537692..7073ea91c349 100644
+index 1418402c2668..50d7d4c983a1 100644
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
-@@ -1712,6 +1712,7 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
+@@ -1731,6 +1731,7 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
+ 	s = to_rockchip_crtc_state(crtc->state);
  
  	spin_lock(&vop->reg_lock);
- 
 +	VOP_WIN_SET(vop, win, yuv_clip, 1);
  	VOP_WIN_SET(vop, win, xmirror, xmirror);
  	VOP_WIN_SET(vop, win, ymirror, ymirror);
  	VOP_WIN_SET(vop, win, format, vop_plane_state->format);
-@@ -2512,6 +2513,7 @@ static void vop_update_csc(struct drm_crtc *crtc)
+@@ -2544,6 +2545,7 @@ static void vop_update_csc(struct drm_crtc *crtc)
  		VOP_CTRL_SET(vop, dsp_data_swap, 0);
  
  	VOP_CTRL_SET(vop, out_mode, s->output_mode);
@@ -612,10 +619,10 @@ index 784e83537692..7073ea91c349 100644
  	switch (s->bus_format) {
  	case MEDIA_BUS_FMT_RGB565_1X16:
 diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
-index 5850572b40ff..b465c08876f8 100644
+index 618de17e608a..391998c7aa50 100644
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
-@@ -171,6 +171,7 @@ struct vop_ctrl {
+@@ -178,6 +178,7 @@ struct vop_ctrl {
  	struct vop_reg dsp_lut_en;
  
  	struct vop_reg out_mode;
@@ -623,7 +630,7 @@ index 5850572b40ff..b465c08876f8 100644
  
  	struct vop_reg xmirror;
  	struct vop_reg ymirror;
-@@ -395,6 +396,7 @@ struct vop_win_phy {
+@@ -409,6 +410,7 @@ struct vop_win_phy {
  	struct vop_reg format;
  	struct vop_reg fmt_10;
  	struct vop_reg csc_mode;
@@ -632,10 +639,10 @@ index 5850572b40ff..b465c08876f8 100644
  	struct vop_reg ymirror;
  	struct vop_reg rb_swap;
 diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
-index 5f517e193cc8..f03009e304f8 100644
+index 9c96d5614e54..aeb1c7644bc9 100644
 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
-@@ -110,6 +110,7 @@ static const struct vop_win_phy rk3288_win01_data = {
+@@ -119,6 +119,7 @@ static const struct vop_win_phy rk3288_win01_data = {
  	.fmt_10 = VOP_REG(RK3288_WIN0_CTRL0, 0x7, 4),
  	.csc_mode = VOP_REG_VER(RK3288_WIN0_CTRL0, 0x3, 10, 3, 2, -1),
  	.rb_swap = VOP_REG(RK3288_WIN0_CTRL0, 0x1, 12),
@@ -643,7 +650,7 @@ index 5f517e193cc8..f03009e304f8 100644
  	.xmirror = VOP_REG_VER(RK3368_WIN0_CTRL0, 0x1, 21, 3, 2, -1),
  	.ymirror = VOP_REG_VER(RK3368_WIN0_CTRL0, 0x1, 22, 3, 2, -1),
  	.act_info = VOP_REG(RK3288_WIN0_ACT_INFO, 0x1fff1fff, 0),
-@@ -277,6 +278,7 @@ static const struct vop_ctrl rk3288_ctrl_data = {
+@@ -286,6 +287,7 @@ static const struct vop_ctrl rk3288_ctrl_data = {
  	.bcsh_color_bar = VOP_REG(RK3288_BCSH_COLOR_BAR, 0xffffff, 8),
  	.bcsh_en = VOP_REG(RK3288_BCSH_COLOR_BAR, 0x1, 0),
  
@@ -651,7 +658,7 @@ index 5f517e193cc8..f03009e304f8 100644
  	.xmirror = VOP_REG(RK3288_DSP_CTRL0, 0x1, 22),
  	.ymirror = VOP_REG(RK3288_DSP_CTRL0, 0x1, 23),
  
-@@ -955,6 +957,7 @@ static const struct vop_ctrl rk3328_ctrl_data = {
+@@ -964,6 +966,7 @@ static const struct vop_ctrl rk3328_ctrl_data = {
  	.dsp_lut_en = VOP_REG(RK3328_DSP_CTRL1, 0x1, 0),
  	.out_mode = VOP_REG(RK3328_DSP_CTRL0, 0xf, 0),
  
@@ -660,7 +667,7 @@ index 5f517e193cc8..f03009e304f8 100644
  	.ymirror = VOP_REG(RK3328_DSP_CTRL0, 0x1, 23),
  
 
-From 93fb1cdc962e44ce72fec1191e0bf200c9aaf130 Mon Sep 17 00:00:00 2001
+From 34af37e51e11b9a48d7ca4a77d4430697e4c775d Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 8 Jul 2018 12:38:00 +0200
 Subject: [PATCH] drm/atomic: use active_only flag for connector atomic
@@ -717,7 +724,7 @@ index f77d4aa1e58b..4da489b54dc5 100644
  
  		DRM_DEBUG_ATOMIC("flushing [CONNECTOR:%d:%s]\n",
 
-From d0f8100f82203017bac6617d3f0e30b524956d36 Mon Sep 17 00:00:00 2001
+From 103d19f54aa345a9a80ed386f750482a9f905ec2 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 22 Jul 2018 14:51:58 +0200
 Subject: [PATCH] drm: rockchip: dw-hdmi: only force YCbCr422 when max tmds is
@@ -743,7 +750,7 @@ index 7273561fe6b1..e2aad6e2149b 100644
  	}
  
 
-From d093be3d79b5c781719298676282e44b7d7bb290 Mon Sep 17 00:00:00 2001
+From 5e6283e0832bf7ef0c8b02cc0576276b1d08b03f Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 22 Jul 2018 15:09:16 +0200
 Subject: [PATCH] drm: bridge: dw-hdmi: signal full range for rgb output
@@ -753,7 +760,7 @@ Subject: [PATCH] drm: bridge: dw-hdmi: signal full range for rgb output
  1 file changed, 8 insertions(+)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index d0866baa75fc..520f87b88130 100644
+index 393bd5b28f07..91c5b8fc8fa0 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -1693,6 +1693,14 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode)
@@ -772,39 +779,7 @@ index d0866baa75fc..520f87b88130 100644
  	 * The Designware IP uses a different byte format from standard
  	 * AVI info frames, though generally the bits are in the correct
 
-From 623aaf53edd860816297c9230d39b5b96b0146f3 Mon Sep 17 00:00:00 2001
+From d6543095fd910b2108e8f823aa4bdc5e90f39965 Mon Sep 17 00:00:00 2001
-From: Myy Miouyouyou <myy@miouyouyou.fr>
-Date: Mon, 21 May 2018 22:32:59 +0200
-Subject: [PATCH] GPU: ARM: Midgard: Adapt to the new mmap call checks.
-
-Now, I don't know if this driver is just one of these "buggy" drivers
-Linus is talking about, or if this is just standard GPU procedure.
-
-Anyway, this patch is due to this change by Linus Torvalds :
-https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=be83bbf806822b1b89e0a0f23cd87cddc409e429
-
-And the fix is inspired by :
-https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=76ef6b28ea4f81c3d511866a9b31392caa833126
-
-Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
----
- drivers/gpu/arm/midgard/mali_kbase_core_linux.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
-index 3a6e5aae0bce..2b24e415dfa6 100644
---- a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
-+++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
-@@ -1155,6 +1155,7 @@ static int kbase_open(struct inode *inode, struct file *filp)
- 
- 	init_waitqueue_head(&kctx->event_queue);
- 	filp->private_data = kctx;
-+	filp->f_mode |= FMODE_UNSIGNED_OFFSET;
- 	kctx->filp = filp;
- 
- 	if (kbdev->infinite_cache_active_default)
-
-From d0e509162ace165ab24c8a005a2666c6c17e4d69 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 28 Jul 2018 10:41:40 +0200
 Subject: [PATCH] WIP: mm: dma-mapping: increase dma pool size
@@ -841,7 +816,7 @@ index 2b05653e8156..2ad8515cd4da 100644
  
  static int __init early_coherent_pool(char *p)
 
-From 9cfc544f5914ccf2a44da96e491195eea763d70f Mon Sep 17 00:00:00 2001
+From a6d53734dc1bf083a8b8d77eb03747cbf834e204 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 4 Aug 2018 15:19:39 +0200
 Subject: [PATCH] drm: add picture_aspect_ratio to hdmi 1.4 4k modes
@@ -885,7 +860,7 @@ index f7d41950614e..69a1eb4ee382 100644
  
  /*** DDC fetch and block validation ***/
 
-From 728a068901826027cf45d404f49b58f6cf02156a Mon Sep 17 00:00:00 2001
+From b6c4fe8035c6ceb21b2420532d95489bf4dbc25c Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 4 Aug 2018 16:26:47 +0200
 Subject: [PATCH] drm: bridge: dw-hdmi: signal none colorimetry for rgb output
@@ -895,7 +870,7 @@ Subject: [PATCH] drm: bridge: dw-hdmi: signal none colorimetry for rgb output
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index 520f87b88130..c6ef3d43f997 100644
+index 91c5b8fc8fa0..8261ba15f98e 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -1694,6 +1694,8 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode)
@@ -908,7 +883,7 @@ index 520f87b88130..c6ef3d43f997 100644
  		frame.ycc_quantization_range = HDMI_YCC_QUANTIZATION_RANGE_FULL;
  	} else {
 
-From bc7d29237337d1506fe63bbb421d64710e176537 Mon Sep 17 00:00:00 2001
+From 52fd44fe708ada3fb673c0b8b093e49beabfd62e Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 4 Aug 2018 16:27:08 +0200
 Subject: [PATCH] drm: bridge: dw-hdmi: signal it content and content type
@@ -918,7 +893,7 @@ Subject: [PATCH] drm: bridge: dw-hdmi: signal it content and content type
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index c6ef3d43f997..a0e25278232b 100644
+index 8261ba15f98e..cdfa295fc323 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -1692,6 +1692,8 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode)
@@ -931,7 +906,7 @@ index c6ef3d43f997..a0e25278232b 100644
  	if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format)) {
  		frame.colorimetry = HDMI_COLORIMETRY_NONE;
 
-From d0b82f5649ddb897cbf92f5e06030244ffc4e9eb Mon Sep 17 00:00:00 2001
+From 6e57feede98bc6134077215139211d51f0fb7b97 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 4 Aug 2018 16:27:40 +0200
 Subject: [PATCH] drm: bridge: dw-hdmi: log infoframes
@@ -941,7 +916,7 @@ Subject: [PATCH] drm: bridge: dw-hdmi: log infoframes
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index a0e25278232b..f56f3224a1c9 100644
+index cdfa295fc323..25546a4471fb 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -1705,6 +1705,8 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode)
@@ -981,7 +956,7 @@ index a0e25278232b..f56f3224a1c9 100644
  	hdmi_writeb(hdmi, frame.length, HDMI_FC_DRM_HB1);
  	hdmi_writeb(hdmi, frame.eotf, HDMI_FC_DRM_PB0);
 
-From 13040ab461d79e1dc720677eb462ace745b33b84 Mon Sep 17 00:00:00 2001
+From dcdbd37723553a9ede3754a1e15c9a1e9d566cf1 Mon Sep 17 00:00:00 2001
 From: Nickey Yang <nickey.yang@rock-chips.com>
 Date: Mon, 17 Jul 2017 16:35:34 +0800
 Subject: [PATCH] MINIARM: set npll be used for hdmi only
@@ -989,23 +964,14 @@ Subject: [PATCH] MINIARM: set npll be used for hdmi only
 Change-Id: I8bebfb2cfb68e3dad172e5547d3886526ad5e912
 Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
 ---
- arch/arm/boot/dts/rk3288.dtsi     | 4 +++-
+ arch/arm/boot/dts/rk3288.dtsi     | 2 ++
  drivers/clk/rockchip/clk-rk3288.c | 4 ++--
- 2 files changed, 5 insertions(+), 3 deletions(-)
+ 2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
-index 8e51132ef7e4..66962169da17 100644
+index 1b7602f25f34..7e536c939cc0 100644
 --- a/arch/arm/boot/dts/rk3288.dtsi
 +++ b/arch/arm/boot/dts/rk3288.dtsi
-@@ -1052,7 +1052,7 @@
-                                   <&cru PCLK_PERI>;
- 		assigned-clock-rates = <594000000>,
- 				       <500000000>, <300000000>,
--				       <150000000>, <75000000>,
-+				       <0>, <75000000>,
- 				       <300000000>, <150000000>,
- 				       <75000000>;
- 	};
 @@ -1303,6 +1303,8 @@
  		resets = <&cru SRST_LCDC0_AXI>, <&cru SRST_LCDC0_AHB>, <&cru SRST_LCDC0_DCLK>;
  		reset-names = "axi", "ahb", "dclk";
@@ -1038,7 +1004,7 @@ index ca6c2ad3de96..415df387a5d6 100644
  			RK3288_CLKGATE_CON(3), 1, GFLAGS),
  	COMPOSITE(DCLK_VOP1, "dclk_vop1", mux_pll_src_cpll_gpll_npll_p, 0,
 
-From fbefbd0989cf14e3d8f7864437a2264ab94c9b3f Mon Sep 17 00:00:00 2001
+From bd89275c319915fc48f830637d9594d5ae9d657d Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 4 Aug 2018 14:51:14 +0200
 Subject: [PATCH] clk: rockchip: rk3288: use npll table to to improve HDMI
@@ -1091,7 +1057,7 @@ index 415df387a5d6..f748a292b7f4 100644
  
  static struct clk_div_table div_hclk_cpu_t[] = {
 
-From d6d68acc58b75aa26c243e21599674e259b58cbd Mon Sep 17 00:00:00 2001
+From e5b26e2385f2792fce564d4ab8901f170ac0ba41 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
 Date: Wed, 30 May 2018 13:06:14 +0200
 Subject: [PATCH] ayufan: fan53555: support syr83x found in rockpro64
@@ -1121,3 +1087,237 @@ index 74e5ae2bc0d2..6b0854a3cae3 100644
  		di->vsel_min = 712500;
  		di->vsel_step = 12500;
  		break;
+
+From 8d6f3424a0d486913f6ab2bebc3cd82e4017be10 Mon Sep 17 00:00:00 2001
+From: Jonas Karlman <jonas@kwiboo.se>
+Date: Sun, 9 Sep 2018 12:33:23 +0200
+Subject: [PATCH] WIP: video: rockchip: iep: fix compile issue
+
+---
+ drivers/video/rockchip/iep/Makefile | 2 +-
+ include/linux/rockchip-iovmm.h      | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/video/rockchip/iep/Makefile b/drivers/video/rockchip/iep/Makefile
+index 37760fbf42b7..c6f7ae87a544 100644
+--- a/drivers/video/rockchip/iep/Makefile
++++ b/drivers/video/rockchip/iep/Makefile
+@@ -1,2 +1,2 @@
+ # SPDX-License-Identifier: GPL-2.0
+-obj-$(CONFIG_IEP) += hw_iep_reg.o iep_drv.o iep_iommu_drm.o iep_iommu_ion.o iep_iommu_ops.o
++obj-$(CONFIG_IEP) += hw_iep_reg.o iep_drv.o iep_iommu_drm.o iep_iommu_ops.o
+diff --git a/include/linux/rockchip-iovmm.h b/include/linux/rockchip-iovmm.h
+index 73e2ff159e86..d87b8d2c9904 100644
+--- a/include/linux/rockchip-iovmm.h
++++ b/include/linux/rockchip-iovmm.h
+@@ -10,6 +10,7 @@
+ #include <linux/list.h>
+ #include <linux/atomic.h>
+ #include <linux/spinlock.h>
++#include <linux/errno.h>
+ 
+ #define IEP_IOMMU_COMPATIBLE_NAME "rockchip,iep_mmu"
+ #define VIP_IOMMU_COMPATIBLE_NAME "rockchip,vip_mmu"
+
+From 1e888a00891c2ded5cd802d987884ad564b8f97f Mon Sep 17 00:00:00 2001
+From: Randy Li <randy.li@rock-chips.com>
+Date: Thu, 20 Sep 2018 10:59:11 +0800
+Subject: [PATCH] Mali: midgard: fix the memory translation for aarch32
+
+When the clients are 32 bits while the kernel is 64 bits,
+we need to translate the memory address before accessing.
+
+Change-Id: I7f47ab94da258e9d170613252aae9b396623cf48
+Signed-off-by: Randy Li <randy.li@rock-chips.com>
+---
+ drivers/gpu/arm/midgard/mali_kbase_core_linux.c | 88 +++++++++++++++++++------
+ 1 file changed, 69 insertions(+), 19 deletions(-)
+
+diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
+index 24bafe2bf32c..65bc5ad2a7c2 100644
+--- a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
++++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
+@@ -515,14 +515,20 @@ copy_failed:
+ 	case KBASE_FUNC_JOB_SUBMIT:
+ 		{
+ 			struct kbase_uk_job_submit *job = args;
++			void __user *user_addr = NULL;
+ 
+ 			if (sizeof(*job) != args_size)
+ 				goto bad_size;
+ 
+-			if (kbase_jd_submit(kctx, job->addr.value,
+-						job->nr_atoms,
+-						job->stride,
+-						false) != 0)
++#ifdef CONFIG_COMPAT
++			if (kbase_ctx_flag(kctx, KCTX_COMPAT))
++				user_addr = compat_ptr(job->addr.compat_value);
++			else
++#endif
++				user_addr = job->addr.value;
++
++			if (kbase_jd_submit(kctx, user_addr, job->nr_atoms,
++					    job->stride, false) != 0)
+ 				ukh->ret = MALI_ERROR_FUNCTION_FAILED;
+ 			break;
+ 		}
+@@ -531,14 +537,20 @@ copy_failed:
+ 	case KBASE_FUNC_JOB_SUBMIT_UK6:
+ 		{
+ 			struct kbase_uk_job_submit *job = args;
++			void __user *user_addr = NULL;
+ 
+ 			if (sizeof(*job) != args_size)
+ 				goto bad_size;
+ 
+-			if (kbase_jd_submit(kctx, job->addr.value,
+-						job->nr_atoms,
+-						job->stride,
+-						true) != 0)
++#ifdef CONFIG_COMPAT
++			if (kbase_ctx_flag(kctx, KCTX_COMPAT))
++				user_addr = compat_ptr(job->addr.compat_value);
++			else
++#endif
++				user_addr = job->addr.value;
++
++			if (kbase_jd_submit(kctx, user_addr, job->nr_atoms,
++					    job->stride, true) != 0)
+ 				ukh->ret = MALI_ERROR_FUNCTION_FAILED;
+ 			break;
+ 		}
+@@ -646,7 +658,8 @@ copy_failed:
+ 				goto bad_size;
+ 
+ 			if (find->gpu_addr & ~PAGE_MASK) {
+-				dev_warn(kbdev->dev, "kbase_legacy_dispatch case KBASE_FUNC_FIND_CPU_OFFSET: find->gpu_addr: passed parameter is invalid");
++				dev_warn(kbdev->dev,
++					"kbase_legacy_dispatch case KBASE_FUNC_FIND_CPU_OFFSET: find->gpu_addr: passed parameter is invalid");
+ 				goto out_bad;
+ 			}
+ 
+@@ -674,8 +687,11 @@ copy_failed:
+ 				goto bad_size;
+ 
+ 			/* version buffer size check is made in compile time assert */
+-			memcpy(get_version->version_buffer, KERNEL_SIDE_DDK_VERSION_STRING, sizeof(KERNEL_SIDE_DDK_VERSION_STRING));
+-			get_version->version_string_size = sizeof(KERNEL_SIDE_DDK_VERSION_STRING);
++			memcpy(get_version->version_buffer,
++			       KERNEL_SIDE_DDK_VERSION_STRING,
++			       sizeof(KERNEL_SIDE_DDK_VERSION_STRING));
++			get_version->version_string_size =
++				sizeof(KERNEL_SIDE_DDK_VERSION_STRING);
+ 			get_version->rk_version = ROCKCHIP_VERSION;
+ 			break;
+ 		}
+@@ -828,7 +844,8 @@ copy_failed:
+ 
+ #ifdef CONFIG_COMPAT
+ 			if (kbase_ctx_flag(kctx, KCTX_COMPAT))
+-				user_buf = compat_ptr(add_data->buf.compat_value);
++				user_buf =
++					compat_ptr(add_data->buf.compat_value);
+ 			else
+ #endif
+ 				user_buf = add_data->buf.value;
+@@ -977,9 +994,9 @@ copy_failed:
+ 
+ 	return ret;
+ 
+- bad_size:
++bad_size:
+ 	dev_err(kbdev->dev, "Wrong syscall size (%d) for %08x\n", args_size, id);
+- out_bad:
++out_bad:
+ 	return -EINVAL;
+ }
+ 
+@@ -1317,7 +1334,16 @@ static int kbase_api_set_flags(struct kbase_context *kctx,
+ static int kbase_api_job_submit(struct kbase_context *kctx,
+ 		struct kbase_ioctl_job_submit *submit)
+ {
+-	return kbase_jd_submit(kctx, submit->addr.value, submit->nr_atoms,
++	void __user *user_addr = NULL;
++
++#ifdef CONFIG_COMPAT
++	if (kbase_ctx_flag(kctx, KCTX_COMPAT))
++		user_addr = compat_ptr(submit->addr.compat_value);
++	else
++#endif
++		user_addr = submit->addr.value;
++
++	return kbase_jd_submit(kctx, user_addr, submit->nr_atoms,
+ 			submit->stride, false);
+ }
+ 
+@@ -1548,6 +1574,7 @@ static int kbase_api_mem_alias(struct kbase_context *kctx,
+ 		union kbase_ioctl_mem_alias *alias)
+ {
+ 	struct base_mem_aliasing_info *ai;
++	void __user *user_addr = NULL;
+ 	u64 flags;
+ 	int err;
+ 
+@@ -1558,8 +1585,15 @@ static int kbase_api_mem_alias(struct kbase_context *kctx,
+ 	if (!ai)
+ 		return -ENOMEM;
+ 
+-	err = copy_from_user(ai, alias->in.aliasing_info.value,
+-			sizeof(*ai) * alias->in.nents);
++#ifdef CONFIG_COMPAT
++	if (kbase_ctx_flag(kctx, KCTX_COMPAT))
++		user_addr =
++			compat_ptr(alias->in.aliasing_info.compat_value);
++	else
++#endif
++		user_addr = alias->in.aliasing_info.value;
++
++	err = copy_from_user(ai, user_addr, sizeof(*ai) * alias->in.nents);
+ 	if (err) {
+ 		vfree(ai);
+ 		return err;
+@@ -1586,10 +1620,18 @@ static int kbase_api_mem_import(struct kbase_context *kctx,
+ {
+ 	int ret;
+ 	u64 flags = import->in.flags;
++	void __user *phandle;
++
++#ifdef CONFIG_COMPAT
++	if (kbase_ctx_flag(kctx, KCTX_COMPAT))
++		phandle = compat_ptr(import->in.phandle.compat_value);
++	else
++#endif
++		phandle = import->in.phandle.value;
+ 
+ 	ret = kbase_mem_import(kctx,
+ 			import->in.type,
+-			import->in.phandle.value,
++			phandle,
+ 			import->in.padding,
+ 			&import->out.gpu_va,
+ 			&import->out.va_pages,
+@@ -1654,6 +1696,7 @@ static int kbase_api_get_profiling_controls(struct kbase_context *kctx,
+ static int kbase_api_mem_profile_add(struct kbase_context *kctx,
+ 		struct kbase_ioctl_mem_profile_add *data)
+ {
++	char __user *user_buf;
+ 	char *buf;
+ 	int err;
+ 
+@@ -1666,7 +1709,14 @@ static int kbase_api_mem_profile_add(struct kbase_context *kctx,
+ 	if (ZERO_OR_NULL_PTR(buf))
+ 		return -ENOMEM;
+ 
+-	err = copy_from_user(buf, data->buffer.value, data->len);
++#ifdef CONFIG_COMPAT
++	if (kbase_ctx_flag(kctx, KCTX_COMPAT))
++		user_buf = compat_ptr(data->buffer.compat_value);
++	else
++#endif
++		user_buf = data->buffer.value;
++
++	err = copy_from_user(buf, user_buf, data->len);
+ 	if (err) {
+ 		kfree(buf);
+ 		return err;

projects/Rockchip/patches/linux/rockchip-4.4/linux-0002-ir.patch

@@ -1,4 +1,4 @@
-From 65d921fb8b2ec126c5e1ff2b846c179d0ab0e4d1 Mon Sep 17 00:00:00 2001
+From 2031709371a600b1b803ec928cc1adb2e9b5a4c1 Mon Sep 17 00:00:00 2001
 From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 Date: Thu, 19 Nov 2015 11:41:36 -0200
 Subject: [PATCH] UPSTREAM: smsir.h: remove a now duplicated definition
@@ -26,7 +26,7 @@ index fc8b7925c532..d9abd96ef48b 100644
  
  struct ir_t {
 
-From 3e5e8aa798a67f94158f7fbdfca9b31021ffab90 Mon Sep 17 00:00:00 2001
+From 3b533a5c5f7880759fcad51e9400851a80295764 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Wed, 6 Sep 2017 18:39:09 +0200
 Subject: [PATCH] [media] rc/keymaps: add keytable for Pine64 IR Remote
@@ -135,7 +135,7 @@ index 7c4bbc4dfab4..3a34a9631dd1 100644
  #define RC_MAP_PINNACLE_GREY             "rc-pinnacle-grey"
  #define RC_MAP_PINNACLE_PCTV_HD          "rc-pinnacle-pctv-hd"
 
-From 8eab80060ab0c45ed3843ea1ab1d355c2e61c417 Mon Sep 17 00:00:00 2001
+From 21e2e6f847c6e1d0f98ce3770e6d380b20af3064 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Wed, 6 Sep 2017 18:39:09 +0200
 Subject: [PATCH] [media] rc/keymaps: add keytable for ODROID IR Remote
@@ -231,7 +231,7 @@ index 3a34a9631dd1..f1badbfbca90 100644
  #define RC_MAP_PINE64                    "rc-pine64"
  #define RC_MAP_PINNACLE_COLOR            "rc-pinnacle-color"
 
-From e4e4bf0e4ffdf3715d29ce0fdc40ac4942b0b509 Mon Sep 17 00:00:00 2001
+From 0cb159b68f91fb352861a23241a24611201e0d05 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Wed, 6 Sep 2017 18:39:09 +0200
 Subject: [PATCH] [media] rc/keymaps: add keytable for WeTek Hub Remote
@@ -327,7 +327,7 @@ index f1badbfbca90..cd8590c99e22 100644
  #define RC_MAP_VIDEOMATE_S350            "rc-videomate-s350"
  #define RC_MAP_VIDEOMATE_TV_PVR          "rc-videomate-tv-pvr"
 
-From c603eb8c844555707072415329d7bb2572d64fdf Mon Sep 17 00:00:00 2001
+From d81bc903c323311f09eb3f8a298c10d99c62f601 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Wed, 6 Sep 2017 18:39:09 +0200
 Subject: [PATCH] [media] rc/keymaps: add keytable for WeTek Play 2 Remote
@@ -454,7 +454,7 @@ index cd8590c99e22..93cac05a5170 100644
  #define RC_MAP_VIDEOMATE_S350            "rc-videomate-s350"
  #define RC_MAP_VIDEOMATE_TV_PVR          "rc-videomate-tv-pvr"
 
-From 6c88a757042bd1f3ea3ec197aa930b7beb48e11a Mon Sep 17 00:00:00 2001
+From 6518b8acbe53a153740bad1e93c9d361fed136fd Mon Sep 17 00:00:00 2001
 From: hzq <hzq@t-firefly.com>
 Date: Mon, 19 Mar 2018 16:47:24 +0800
 Subject: [PATCH] [media] rc/keymaps: add keytable for ROC-RK3328-CC Remote
@@ -550,7 +550,7 @@ index 93cac05a5170..8bbe335e650c 100644
  #define RC_MAP_STREAMZAP                 "rc-streamzap"
  #define RC_MAP_TBS_NEC                   "rc-tbs-nec"
 
-From 04a93492c4c715a6a826c93f69e0855ca5534e81 Mon Sep 17 00:00:00 2001
+From c0220800efec28f6a59eae563f4f083ceedff6cc Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Tue, 3 Jul 2018 21:55:56 +0200
 Subject: [PATCH] [media] rc/keymaps: add keytable for T-Chip TRN9 IR Remote

projects/Rockchip/patches/linux/rockchip-4.4/linux-0003-cec.patch

@@ -1,4 +1,4 @@
-From dbd999a2a4e11f420098860e84bfb3c9151b4622 Mon Sep 17 00:00:00 2001
+From 0dcc2992b7f03fbe5bf9bd9f65edaf5479bf975a Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 4 Sep 2017 22:34:19 +0200
 Subject: [PATCH] BACKPORT: HDMI CEC support from v4.15
@@ -3041,7 +3041,7 @@ index 2758687300b4..41e8dff588e1 100644
  /*
   * MT_TOOL types
 
-From 48d7f1f5bd8f2a2252158e7eda0d83975d7b170b Mon Sep 17 00:00:00 2001
+From 8e3b262321c2121f8ceed952be3619039aebea9d Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 4 Sep 2017 22:34:22 +0200
 Subject: [PATCH] BACKPORT: Pulse Eight HDMI CEC from v4.15
@@ -3944,7 +3944,7 @@ index becdd78295cc..4588c66a8df0 100644
  
  #endif /* _UAPI_SERIO_H */
 
-From c9a3bba3534d8673f07a233e5298d12979ada5b8 Mon Sep 17 00:00:00 2001
+From 7f6dbf0df7f833b1d9e8da72365eebffd046e7c7 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 4 Sep 2017 22:34:24 +0200
 Subject: [PATCH] BACKPORT: RainShadow Tech HDMI CEC from v4.15
@@ -4427,7 +4427,7 @@ index 4588c66a8df0..89b72003fb68 100644
  
  #endif /* _UAPI_SERIO_H */
 
-From d7ef718f1c62b9f4e0b7042d5b4040a14335c369 Mon Sep 17 00:00:00 2001
+From f532f514ca373430332f2733be987335af7ae75c Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 2 Sep 2017 16:23:11 +0200
 Subject: [PATCH] [media] rc/keymaps: initialize rc-cec early
@@ -4450,7 +4450,7 @@ index 354c8e724b8e..fb0c2b1f3814 100644
  
  MODULE_LICENSE("GPL");
 
-From e583e082ee42c04d3458ee71521175d39b4daed5 Mon Sep 17 00:00:00 2001
+From 54c779a399fb852e06f11a03bf03c31090c4b722 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 2 Sep 2017 16:23:11 +0200
 Subject: [PATCH] drm/bridge: dw-hdmi: read edid on hpd event
@@ -4460,7 +4460,7 @@ Subject: [PATCH] drm/bridge: dw-hdmi: read edid on hpd event
  1 file changed, 19 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index d57d999c50a5..4ae2735f59e4 100644
+index 8cb2cb4e61a6..c045cc0717cd 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -2479,6 +2479,7 @@ static void dw_hdmi_bridge_nop(struct drm_bridge *bridge)

projects/Rockchip/patches/linux/rockchip-4.4/linux-0004-audio.patch

@@ -1,4 +1,4 @@
-From dabace918ba0543c5a12e03fb823886891cd82dc Mon Sep 17 00:00:00 2001
+From fa2bd9cdc869b32ba00f0bba79b63e1fd53f8cdb Mon Sep 17 00:00:00 2001
 From: Chris Zhong <zyw@rock-chips.com>
 Date: Mon, 18 Jul 2016 22:34:34 +0800
 Subject: [PATCH] UPSTREAM: ASoC: rockchip: correct the spdif clk
@@ -53,7 +53,7 @@ index c211750b54ee..784941ca2408 100644
  		SPDIF_CFGR_CLK_DIV_MASK | SPDIF_CFGR_HALFWORD_ENABLE |
  		SDPIF_CFGR_VDW_MASK,
 
-From 3069a5725338532939d13e3dc329f2b3d183b260 Mon Sep 17 00:00:00 2001
+From 46e3e82a547b78ca5db11a8444f787fd15f8e8ce Mon Sep 17 00:00:00 2001
 From: Sugar Zhang <sugar.zhang@rock-chips.com>
 Date: Wed, 7 Sep 2016 14:30:21 +0800
 Subject: [PATCH] UPSTREAM: ASoC: rockchip: spdif: restore register during
@@ -100,7 +100,7 @@ index 784941ca2408..831e4caf29d3 100644
  
  static int rk_spdif_hw_params(struct snd_pcm_substream *substream,
 
-From d852c659ff563456480c55cfea53c578399c04ff Mon Sep 17 00:00:00 2001
+From d8a8c9964022565ecf7b5ea7249262c3ac381a1b Mon Sep 17 00:00:00 2001
 From: Arnaud Pouliquen <arnaud.pouliquen@st.com>
 Date: Tue, 3 Jan 2017 16:52:50 +0100
 Subject: [PATCH] UPSTREAM: DRM: add help to get ELD speaker allocation
@@ -148,7 +148,7 @@ index 85861b63e77a..55201e7e2ede 100644
  	int (*get_edid_block)(void *data, u8 *buf, unsigned int block,
  			      size_t len),
 
-From 4e08e72298c858a65950b98ca62613fb95cd0a35 Mon Sep 17 00:00:00 2001
+From e622344ce58345eda1ce7372bf7e91e4e90ece5f Mon Sep 17 00:00:00 2001
 From: Arnaud Pouliquen <arnaud.pouliquen@st.com>
 Date: Tue, 3 Jan 2017 16:52:51 +0100
 Subject: [PATCH] UPSTREAM: ASoC: core: add optional pcm_new callback for DAI
@@ -229,7 +229,7 @@ index 3c6713da3ad9..e46e80c0e07d 100644
  			INIT_DELAYED_WORK(&rtd->delayed_work,
  						codec2codec_close_delayed_work);
 
-From 900f1d7bb2cddd1f445e0f3ef92fb0f7056a4c5a Mon Sep 17 00:00:00 2001
+From 3877e4beac5a5efc2898185fe75555e21cf6b090 Mon Sep 17 00:00:00 2001
 From: Arnaud Pouliquen <arnaud.pouliquen@st.com>
 Date: Tue, 3 Jan 2017 16:52:52 +0100
 Subject: [PATCH] UPSTREAM: ASoC: hdmi-codec: add channel mapping control
@@ -715,7 +715,7 @@ index 028d60c196ae..cb78d8971b41 100644
  	snd_soc_unregister_codec(&pdev->dev);
  	return 0;
 
-From 5ad6154eea74dec3635e2417f06ad12d3f0a36c4 Mon Sep 17 00:00:00 2001
+From 52c48ffd0956821dd3f1315b9ec3fd2a677b2b63 Mon Sep 17 00:00:00 2001
 From: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
 Date: Thu, 15 Jun 2017 07:53:11 +0200
 Subject: [PATCH] UPSTREAM: ASoC: rockchip: Fix an error handling in
@@ -756,7 +756,7 @@ index b359639c1038..02ff642499bf 100644
  		if (val >= 2 && val <= 8)
  			soc_dai->playback.channels_max = val;
 
-From 9aeca2222a8f8a700c446fc9a38235ab2e3a4efd Mon Sep 17 00:00:00 2001
+From 7b9368e1f2d50d7ca5b07ea50240fd8f45d884fe Mon Sep 17 00:00:00 2001
 From: Markus Elfring <elfring@users.sourceforge.net>
 Date: Thu, 10 Aug 2017 18:38:09 +0200
 Subject: [PATCH] UPSTREAM: ASoC: rockchip: Delete an error message for a
@@ -791,7 +791,7 @@ index 02ff642499bf..16ff8d5e0033 100644
  	i2s->dev = &pdev->dev;
  
 
-From dad1bc0769692d7fd45701a4ab3fb55be012e01e Mon Sep 17 00:00:00 2001
+From f217d206adafde4eb886ffbd5ecd7779c37438ef Mon Sep 17 00:00:00 2001
 From: John Keeping <john@metanate.com>
 Date: Thu, 14 Sep 2017 16:58:55 +0100
 Subject: [PATCH] UPSTREAM: ASoC: rockchip: i2s: fix unbalanced clk_disable
@@ -820,7 +820,7 @@ index 16ff8d5e0033..986ad2efc8e9 100644
  
  	return 0;
 
-From 20b260f46771f7313ecd6e296ec6c08a43967eb4 Mon Sep 17 00:00:00 2001
+From 9cca8ff3584aedce10d3099b504e66737c9c9e44 Mon Sep 17 00:00:00 2001
 From: John Keeping <john@metanate.com>
 Date: Mon, 8 Jan 2018 16:01:04 +0000
 Subject: [PATCH] UPSTREAM: ASoC: rockchip: i2s: fix playback after runtime
@@ -887,7 +887,7 @@ index 986ad2efc8e9..5297373fe6c4 100644
  		return false;
  	}
 
-From fa8e48f2fd0abe00ee0f04128a2e9b4fed184c3f Mon Sep 17 00:00:00 2001
+From 7c877ceaa52d81023ebda69e3d90f54ab8403798 Mon Sep 17 00:00:00 2001
 From: Romain Perier <romain.perier@collabora.com>
 Date: Fri, 14 Apr 2017 10:31:12 +0200
 Subject: [PATCH] UPSTREAM: drm: dw-hdmi: add specific I2S and AHB functions
@@ -915,7 +915,7 @@ Link: http://patchwork.freedesktop.org/patch/msgid/20170414083113.4255-2-romain.
  1 file changed, 25 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index d57d999c50a5..0541d96be662 100644
+index 8cb2cb4e61a6..8726498e9f73 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -263,6 +263,9 @@ struct dw_hdmi {
@@ -987,7 +987,7 @@ index d57d999c50a5..0541d96be662 100644
  		pdevinfo.name = "dw-hdmi-i2s-audio";
  		pdevinfo.data = &audio;
 
-From f856228e8933ba1e6375dbda53cc59da8d71647a Mon Sep 17 00:00:00 2001
+From 8b1551df18617eba99d59f89724191954a7213a4 Mon Sep 17 00:00:00 2001
 From: Romain Perier <romain.perier@collabora.com>
 Date: Thu, 20 Apr 2017 14:34:34 +0530
 Subject: [PATCH] UPSTREAM: drm: dw-hdmi: gate audio clock from the I2S
@@ -1015,7 +1015,7 @@ Signed-off-by: Archit Taneja <architt@codeaurora.org>
  1 file changed, 17 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index 0541d96be662..f3a2034a0883 100644
+index 8726498e9f73..17c182cb07b5 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -824,6 +824,15 @@ void dw_hdmi_set_sample_rate(struct dw_hdmi *hdmi, unsigned int rate)
@@ -1078,7 +1078,7 @@ index 0541d96be662..f3a2034a0883 100644
  		pdevinfo.name = "dw-hdmi-i2s-audio";
  		pdevinfo.data = &audio;
 
-From 5736074e471dc5306e07581bf0958043cf434341 Mon Sep 17 00:00:00 2001
+From 442b913082d21de7a8364344feb520946413da5b Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 7 Aug 2017 22:24:15 +0200
 Subject: [PATCH] drm: dw-hdmi-i2s: sync with upstream
@@ -1157,7 +1157,7 @@ index f1f62d8c1d16..5ff993a35ab6 100644
  		.name = DRIVER_NAME,
  		.owner = THIS_MODULE,
 
-From d2f29756df76806c12fa12b668aeb8ac5f626bdd Mon Sep 17 00:00:00 2001
+From 1d3de24bd61e0bfba1a9e042e040fa65346ccd9d Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 2 Apr 2017 11:33:39 +0200
 Subject: [PATCH] drm: dw-hdmi-i2s: implement get_eld
@@ -1214,7 +1214,7 @@ index 5ff993a35ab6..e7312571e2cb 100644
  
  static int snd_dw_hdmi_probe(struct platform_device *pdev)
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index f3a2034a0883..c222b6455f03 100644
+index 17c182cb07b5..df1ea752ac3d 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -3750,6 +3750,7 @@ int dw_hdmi_bind(struct device *dev, struct device *master,
@@ -1226,7 +1226,7 @@ index f3a2034a0883..c222b6455f03 100644
  		hdmi->disable_audio = dw_hdmi_i2s_audio_disable;
  
 
-From 18a9fcdb5cbde0462179d04336622cb4f97c2a7e Mon Sep 17 00:00:00 2001
+From 1e16f2f6b861a7273d922c9251665acec542eed9 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 17 Apr 2017 13:09:16 +0200
 Subject: [PATCH] drm: dw-hdmi-i2s: configure channel allocation
@@ -1249,7 +1249,7 @@ index e7312571e2cb..1d4570e3fbed 100644
  	/* Set LFEPBLDOWN-MIX INH and LSV */
  	hdmi_write(audio, 0x00, HDMI_FC_AUDICONF3);
 
-From c19ba12d08a8c491d21a1daf305b1b58231ca362 Mon Sep 17 00:00:00 2001
+From 747742580e282f4374100909906f6957c997c4a3 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 14 Aug 2017 00:14:05 +0200
 Subject: [PATCH] ASoC: hdmi-codec: reorder channel map
@@ -1394,7 +1394,7 @@ index cb78d8971b41..b74659bc3bbc 100644
  
  struct hdmi_codec_priv {
 
-From 0b22ce2a2766052fe28a3162623d19ba38adaef5 Mon Sep 17 00:00:00 2001
+From 1cdb1f115b4bc9781c90d01d914dd4bbac6d0977 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 27 Aug 2017 23:32:40 +0200
 Subject: [PATCH] ASoC: codecs: rk3328: limit to working rates
@@ -1422,7 +1422,7 @@ index af1b7429b6d4..d0b4578ffa0e 100644
  				    SNDRV_PCM_FMTBIT_S20_3LE |
  				    SNDRV_PCM_FMTBIT_S24_LE |
 
-From f96be8cf25bfda88d5c492f42e1f6ca5951356f3 Mon Sep 17 00:00:00 2001
+From 878d789ff5faa02f0da5e68126e2276124611eeb Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 8 Jul 2018 12:34:43 +0200
 Subject: [PATCH] drm: dw-hdmi: change audio config
@@ -1467,7 +1467,7 @@ index 1d4570e3fbed..d0904f6b7a82 100644
  
  static int dw_hdmi_i2s_get_eld(struct device *dev, void *data, u8 *buf, size_t len)
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index c222b6455f03..065723179791 100644
+index df1ea752ac3d..4bf4ff0fd741 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -89,6 +89,7 @@ static const struct dw_hdmi_audio_tmds_n common_tmds_n_table[] = {
@@ -1511,7 +1511,7 @@ index c222b6455f03..065723179791 100644
  
  static void dw_hdmi_ahb_audio_enable(struct dw_hdmi *hdmi)
 
-From ed2e01d46f3bbf3eda4d37ce2a6e8874b15a478a Mon Sep 17 00:00:00 2001
+From 6bf23972f26fde1abad52cd1a65d1223d51d47c2 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 8 Jul 2018 12:56:51 +0200
 Subject: [PATCH] WIP: drm: dw-hdmi: use Auto CTS mode
@@ -1521,7 +1521,7 @@ Subject: [PATCH] WIP: drm: dw-hdmi: use Auto CTS mode
  1 file changed, 31 insertions(+), 21 deletions(-)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index 065723179791..841bdfcae3e0 100644
+index 4bf4ff0fd741..2583320f3289 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -643,14 +643,18 @@ static struct i2c_adapter *dw_hdmi_i2c_adapter(struct dw_hdmi *hdmi)

projects/Rockchip/patches/linux/rockchip-4.4/linux-0006-rtl8211f.patch

@@ -1,4 +1,4 @@
-From c5300de0fe982ae8a78e1b95ef7bf30b744e4ca1 Mon Sep 17 00:00:00 2001
+From eec386c5e9f5067dc7fdd3c86adae7de835e090a Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Fri, 25 Nov 2016 14:12:01 +0100
 Subject: [PATCH] UPSTREAM: net: phy: realtek: fix enabling of the TX-delay for
@@ -66,7 +66,7 @@ index 43ab691362d4..686f3b259dc0 100644
  	return 0;
  }
 
-From 647c38d9964680f7fbb24c5a889ef74b23b4cbd4 Mon Sep 17 00:00:00 2001
+From e0a1654d1e79bea21f6397b6caa038c2dee25f97 Mon Sep 17 00:00:00 2001
 From: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
 Date: Tue, 12 Sep 2017 18:54:35 +0900
 Subject: [PATCH] UPSTREAM: net: phy: realtek: rename RTL8211F_PAGE_SELECT to
@@ -132,7 +132,7 @@ index 686f3b259dc0..d58cc8f518ac 100644
  	return 0;
  }
 
-From 724532e7b4ad78722821763c639a73383a0f4418 Mon Sep 17 00:00:00 2001
+From 4ec70bc0ea714cc0129a4631dbda493ba706f40f Mon Sep 17 00:00:00 2001
 From: Jassi Brar <jaswinder.singh@linaro.org>
 Date: Tue, 12 Sep 2017 18:54:36 +0900
 Subject: [PATCH] UPSTREAM: net: phy: realtek: add RTL8201F phy-id and
@@ -235,7 +235,7 @@ index d58cc8f518ac..422cf1f6a60c 100644
  	{ 0x001cc914, 0x001fffff },
  	{ 0x001cc915, 0x001fffff },
 
-From 933e1e195c40a941b6e5dec0c6a3a4bb7f804cf7 Mon Sep 17 00:00:00 2001
+From cd0c207d7747ac36c446099ff018682373999764 Mon Sep 17 00:00:00 2001
 From: Heiner Kallweit <hkallweit1@gmail.com>
 Date: Sun, 12 Nov 2017 16:16:04 +0100
 Subject: [PATCH] UPSTREAM: net: phy: realtek: fix RTL8211F interrupt mode
@@ -280,7 +280,7 @@ index 422cf1f6a60c..a30d0c08c63b 100644
  	return err;
  }
 
-From 046a2dc318a05236e06b09d8c0ca3f1005cbceca Mon Sep 17 00:00:00 2001
+From df04368281177832f4dff078f0cc735ce651ded1 Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Sat, 2 Dec 2017 22:51:24 +0100
 Subject: [PATCH] UPSTREAM: net: phy: realtek: use the BIT and GENMASK macros
@@ -329,7 +329,7 @@ index a30d0c08c63b..f8dc29a75828 100644
  #define RTL8201F_ISR		0x1e
  #define RTL8201F_IER		0x13
 
-From 7894b1cae69475242cdb1ca0fb639a5d70ac6316 Mon Sep 17 00:00:00 2001
+From c6479ba05b0013658491a86171df7e0110a0e85a Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Sat, 2 Dec 2017 22:51:25 +0100
 Subject: [PATCH] UPSTREAM: net: phy: realtek: rename RTL821x_INER_INIT to
@@ -370,7 +370,7 @@ index f8dc29a75828..89308eac4088 100644
  		err = phy_write(phydev, RTL821x_INER, 0);
  
 
-From f6e8b6c88c6b3d4925607575bc4387a289d49708 Mon Sep 17 00:00:00 2001
+From c49b1806174ac4140a3fe90c626ef694992f7db6 Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Sat, 2 Dec 2017 22:51:26 +0100
 Subject: [PATCH] UPSTREAM: net: phy: realtek: group all register bit #defines
@@ -414,7 +414,7 @@ index 89308eac4088..df97d903d2bf 100644
  #define RTL8211F_TX_DELAY	BIT(8)
  
 
-From d5e2b112bb8e5707fc2fb727122ee5a8444ee462 Mon Sep 17 00:00:00 2001
+From 3cd6e2f5de15c4c071d9ca9f02efcbd23b8435ad Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Sat, 2 Dec 2017 22:51:27 +0100
 Subject: [PATCH] UPSTREAM: net: phy: realtek: use the same indentation for all
@@ -474,7 +474,7 @@ index df97d903d2bf..701f34ad7d8d 100644
  MODULE_DESCRIPTION("Realtek PHY driver");
  MODULE_AUTHOR("Johnson Leung");
 
-From 8c16425a3c99a1cca4458eb17bd6414d65074027 Mon Sep 17 00:00:00 2001
+From 47e40b66fdafc0ce940090626759fe8418034a0e Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Sat, 2 Dec 2017 22:51:28 +0100
 Subject: [PATCH] UPSTREAM: net: phy: realtek: add utility functions to
@@ -645,7 +645,7 @@ index 701f34ad7d8d..b1d52e61d91c 100644
  	return 0;
  }
 
-From 13e556c6d4ece3c890edc414f205cc26381e9826 Mon Sep 17 00:00:00 2001
+From b747e5d48f83fd4d3b824578f666ac136bc6de49 Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Sat, 2 Dec 2017 23:06:48 +0100
 Subject: [PATCH] FROMLIST: net: phy: realtek: add support for configuring the
@@ -755,7 +755,7 @@ index b1d52e61d91c..890ea9d18d27 100644
  		return ret;
  
 
-From e8fa4ce26460af84f028b7d215134caa33aa9ecb Mon Sep 17 00:00:00 2001
+From 4264d7cd3670514648b2ef632097c80e210e5690 Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Sat, 2 Dec 2017 23:06:49 +0100
 Subject: [PATCH] FROMLIST: net: phy: realtek: configure the INTB pin on
@@ -834,7 +834,7 @@ index 890ea9d18d27..f307d220b49a 100644
  	return rtl8211x_page_write(phydev, 0xa42, RTL821x_INER, val);
  }
 
-From dd026c252cd898bca0b85eb14aa6479b415d2471 Mon Sep 17 00:00:00 2001
+From 5f21ae02ffa16fafd12f635e7a5965842d7d492a Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Sat, 2 Dec 2017 23:06:50 +0100
 Subject: [PATCH] FROMLIST: net: phy: realtek: add more interrupt bits for
@@ -868,3 +868,4 @@ index f307d220b49a..15d342eefd6d 100644
  
  #define RTL821x_INSR				0x13
  
+

projects/Rockchip/patches/linux/rockchip-4.4/linux-0007-dtoverlay-configfs.patch

@@ -1,4 +1,4 @@
-From bb0e3fa6305fe3dead0aa670d7979d6ebcbaf47d Mon Sep 17 00:00:00 2001
+From 062e69c83449e4f5f363bb3caf4ba411907636d5 Mon Sep 17 00:00:00 2001
 From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
 Date: Thu, 22 Oct 2015 23:30:04 +0300
 Subject: [PATCH] UPSTREAM: configfs: implement binary attributes
@@ -651,7 +651,7 @@ index 758a029011b1..f7300d023dbe 100644
   * If allow_link() exists, the item can symlink(2) out to other
   * items.  If the item is a group, it may support mkdir(2).
 
-From 5bbcb67edd92f639228cbaf7d597af715442db16 Mon Sep 17 00:00:00 2001
+From 2dc994339b24321895cff69fda659e47648871be Mon Sep 17 00:00:00 2001
 From: Octavian Purdila <octavian.purdila@intel.com>
 Date: Wed, 23 Mar 2016 14:14:48 +0200
 Subject: [PATCH] UPSTREAM: configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions
@@ -689,7 +689,7 @@ index f7300d023dbe..658066d63180 100644
  		.ca_name	= __stringify(_name),		\
  		.ca_mode	= S_IWUSR,			\
 
-From 34d6438a4d2cedcd1b47f55a3cc63374252c6682 Mon Sep 17 00:00:00 2001
+From a2a707f138cf997e098a6d3aceac4b0944f7d76e Mon Sep 17 00:00:00 2001
 From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
 Date: Wed, 4 Dec 2013 19:32:00 +0200
 Subject: [PATCH] FROMLIST: OF: DT-Overlay configfs interface (v7)

projects/Rockchip/patches/linux/rockchip-4.4/linux-0008-mmc-pwrseq.patch

@@ -1,4 +1,4 @@
-From 75bb99dc815464846a4add357494acf04212271d Mon Sep 17 00:00:00 2001
+From 625c86fa85aa4d18f7711d0314f2ef78a71b79c0 Mon Sep 17 00:00:00 2001
 From: Julia Lawall <Julia.Lawall@lip6.fr>
 Date: Sat, 14 Nov 2015 18:05:20 +0100
 Subject: [PATCH] UPSTREAM: mmc: pwrseq: constify mmc_pwrseq_ops structures
@@ -56,7 +56,7 @@ index d10538bb5e07..2b16263458af 100644
  	.post_power_on = mmc_pwrseq_simple_post_power_on,
  	.power_off = mmc_pwrseq_simple_power_off,
 
-From 1977551c6ef29f55b398a02112e3075c9a38649d Mon Sep 17 00:00:00 2001
+From dda0216c4619c51bb5e560e2e9a8977ae92c2598 Mon Sep 17 00:00:00 2001
 From: Martin Fuzzey <mfuzzey@parkeon.com>
 Date: Wed, 20 Jan 2016 16:08:03 +0100
 Subject: [PATCH] UPSTREAM: mmc: pwrseq_simple: Make reset-gpios optional to
@@ -128,7 +128,7 @@ index 2b16263458af..aba786daebca 100644
  		goto clk_put;
  	}
 
-From e79ed0004dc68dc2f2189256bf00a1f579c78f1a Mon Sep 17 00:00:00 2001
+From 58975b7a58defa92efd5533cc731fb9a0c1cb780 Mon Sep 17 00:00:00 2001
 From: Peter Chen <peter.chen@freescale.com>
 Date: Wed, 6 Jan 2016 11:34:10 +0800
 Subject: [PATCH] UPSTREAM: mmc: core: pwrseq_simple: remove unused header file
@@ -153,7 +153,7 @@ index aba786daebca..bc173e18b71c 100644
  
  #include <linux/mmc/host.h>
 
-From 545d059f7a0a4c470acfdb0fff30397899597f09 Mon Sep 17 00:00:00 2001
+From 01946788b015b9d3f7d18f5b4a43e09e6bf66623 Mon Sep 17 00:00:00 2001
 From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
 Date: Thu, 14 Apr 2016 14:02:14 +0100
 Subject: [PATCH] UPSTREAM: mmc: pwrseq_simple: add to_pwrseq_simple() macro
@@ -220,7 +220,7 @@ index bc173e18b71c..f94271bb1f6b 100644
  	if (!IS_ERR(pwrseq->reset_gpios))
  		gpiod_put_array(pwrseq->reset_gpios);
 
-From e8c5f0b9383e6a528c8fc00d61755f8187e4c0b8 Mon Sep 17 00:00:00 2001
+From b76637491013b2298cf46729767ba76544d4023b Mon Sep 17 00:00:00 2001
 From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
 Date: Thu, 14 Apr 2016 14:02:15 +0100
 Subject: [PATCH] UPSTREAM: mmc: pwrseq_emmc: add to_pwrseq_emmc() macro
@@ -267,7 +267,7 @@ index 4a82bc77fe49..c2d732aa464c 100644
  	unregister_restart_handler(&pwrseq->reset_nb);
  	gpiod_put(pwrseq->reset_gpio);
 
-From ef2f3c5b7375b930697a64c85f30f9109e631cb0 Mon Sep 17 00:00:00 2001
+From c1631d2cea4e5956e368c4652859a9090a509af2 Mon Sep 17 00:00:00 2001
 From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
 Date: Thu, 14 Apr 2016 14:02:16 +0100
 Subject: [PATCH] UPSTREAM: mmc: pwrseq: convert to proper platform device
@@ -785,7 +785,7 @@ index f94271bb1f6b..450d907c6e6c 100644
 +module_platform_driver(mmc_pwrseq_simple_driver);
 +MODULE_LICENSE("GPL v2");
 
-From 42eb02ddb70002e4f72fa627037b6acbdd4cb7a1 Mon Sep 17 00:00:00 2001
+From 2abada2ff3999a38dc87d5803f98141a0971c06c Mon Sep 17 00:00:00 2001
 From: Hans de Goede <hdegoede@redhat.com>
 Date: Sun, 7 Aug 2016 21:02:38 +0200
 Subject: [PATCH] UPSTREAM: mmc: pwrseq-simple: Add an optional
@@ -861,7 +861,7 @@ index 450d907c6e6c..1304160de168 100644
  	pwrseq->pwrseq.ops = &mmc_pwrseq_simple_ops;
  	pwrseq->pwrseq.owner = THIS_MODULE;
 
-From bf90ebd56d6f327f77bd7add55b3593679cd5c67 Mon Sep 17 00:00:00 2001
+From 4d0a703460821fc7541ae96916eca948e326b16c Mon Sep 17 00:00:00 2001
 From: Ulf Hansson <ulf.hansson@linaro.org>
 Date: Sat, 6 May 2017 11:41:30 +0200
 Subject: [PATCH] UPSTREAM: mmc: dt: pwrseq-simple: Invent power-off-delay-us
@@ -897,7 +897,7 @@ index e25436861867..9029b45b8a22 100644
  Example:
  
 
-From bc79b1f8ca4d16d45b93c2888474bb3f11b10226 Mon Sep 17 00:00:00 2001
+From e85294cdf12c6a6e6fb3c24cae1ad0994ae6aca2 Mon Sep 17 00:00:00 2001
 From: Ulf Hansson <ulf.hansson@linaro.org>
 Date: Sat, 6 May 2017 11:43:05 +0200
 Subject: [PATCH] UPSTREAM: mmc: pwrseq_simple: Parse DTS for the

projects/Rockchip/patches/linux/rockchip-4.4/linux-0009-mmc.patch

@@ -1,4 +1,4 @@
-From 38396ba52ab85ea1eabea3c92fd7532f8732f92e Mon Sep 17 00:00:00 2001
+From 569de779d11ff8739e9ab4d8b4a5c505d1892e12 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Tue, 24 Jul 2018 15:49:29 +0200
 Subject: [PATCH] mmc: core: use hs400es voltage flags
@@ -25,7 +25,7 @@ index a814eb6882aa..1d950f0b3aa6 100644
  
  	/* If fails try again during next card power cycle */
 
-From 92a57737adc14e15e80b6913932bb5d2d3478068 Mon Sep 17 00:00:00 2001
+From feda1a0c04130bd7391570025c5349e506ce8250 Mon Sep 17 00:00:00 2001
 From: Haibo Chen <haibo.chen@nxp.com>
 Date: Tue, 8 Aug 2017 18:54:01 +0800
 Subject: [PATCH] UPSTREAM: mmc: mmc: correct the logic for setting HS400ES
@@ -59,7 +59,7 @@ index 1d950f0b3aa6..70de514dd061 100644
  
  	if (!(host->caps & MMC_CAP_8_BIT_DATA)) {
 
-From 108a045df9dc1cee2127aec0bdd327ba7f2fdb81 Mon Sep 17 00:00:00 2001
+From 44476ecad8800bb8412f65c03508c68b1a0e1dbc Mon Sep 17 00:00:00 2001
 From: Ulf Hansson <ulf.hansson@linaro.org>
 Date: Wed, 25 Jan 2017 10:12:10 +0100
 Subject: [PATCH] UPSTREAM: mmc: core: Remove redundant code in
@@ -97,7 +97,7 @@ index 3e3c79feb07b..b69c96ad9486 100644
  	 * If we cannot switch voltages, return failure so the caller
  	 * can continue without UHS mode
 
-From d28c1bfff6556db2c4ce1093091293cf20542202 Mon Sep 17 00:00:00 2001
+From aeee71440b8948d2415527762a6bb9148b7d3cfa Mon Sep 17 00:00:00 2001
 From: Ulf Hansson <ulf.hansson@linaro.org>
 Date: Wed, 25 Jan 2017 10:25:01 +0100
 Subject: [PATCH] UPSTREAM: mmc: core: Clarify usage of
@@ -187,7 +187,7 @@ index c586b11a40b5..f221418542e2 100644
  			mmc_sdio_resend_if_cond(host, card);
  			retries--;
 
-From 0f61c64862ed54163c5f88389170c95055a74f68 Mon Sep 17 00:00:00 2001
+From 8e6435c0331f574240c316ae2406b5fc5c9e46af Mon Sep 17 00:00:00 2001
 From: Ulf Hansson <ulf.hansson@linaro.org>
 Date: Wed, 25 Jan 2017 11:12:34 +0100
 Subject: [PATCH] UPSTREAM: mmc: core: Rename __mmc_set_signal_voltage() to
@@ -315,7 +315,7 @@ index 70de514dd061..dd0040a10c0b 100644
  
  		pr_err("%s: %s failed, error %d\n", mmc_hostname(card->host),
 
-From db9fd591980256d95de5675ebd84759b9cc9831c Mon Sep 17 00:00:00 2001
+From 4e08609c259fd79367a83f8907f5e89747007573 Mon Sep 17 00:00:00 2001
 From: Adrian Hunter <adrian.hunter@intel.com>
 Date: Mon, 25 Sep 2017 11:29:03 +0300
 Subject: [PATCH] UPSTREAM: mmc: core: Factor out mmc_host_set_uhs_voltage()
@@ -411,7 +411,7 @@ index 0e4bc1c7a773..11f3d2c22ecb 100644
  void mmc_set_timing(struct mmc_host *host, unsigned int timing);
  void mmc_set_driver_type(struct mmc_host *host, unsigned int drv_type);
 
-From 9c2d593200bd835b8e55eb6e0ba188e4dd9c744e Mon Sep 17 00:00:00 2001
+From f875b30606e15e1b2f30982476a7de2d05682fb6 Mon Sep 17 00:00:00 2001
 From: Adrian Hunter <adrian.hunter@intel.com>
 Date: Mon, 25 Sep 2017 11:29:04 +0300
 Subject: [PATCH] UPSTREAM: mmc: sd: Fix signal voltage when there is no power
@@ -532,7 +532,7 @@ index d9943d82db95..2808a281d094 100644
  	return 0;
  
 
-From 6ee3035196c307a77f95b1c1f3cc537e467fb838 Mon Sep 17 00:00:00 2001
+From 9cfa1314108ecd9922ae05ff7c80effb21a92b95 Mon Sep 17 00:00:00 2001
 From: Ulf Hansson <ulf.hansson@linaro.org>
 Date: Thu, 5 Apr 2018 21:24:15 +0200
 Subject: [PATCH] UPSTREAM: mmc: core: Share internal function to set initial
@@ -603,7 +603,7 @@ index 11f3d2c22ecb..2634722265ad 100644
  void mmc_set_driver_type(struct mmc_host *host, unsigned int drv_type);
  int mmc_select_drive_strength(struct mmc_card *card, unsigned int max_dtr,
 
-From adadab9687a3e07be7557e4272fdf5a007b4c604 Mon Sep 17 00:00:00 2001
+From 102ef77480a77195821125c6c5afe0b61ac2672c Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Tue, 24 Jul 2018 15:50:06 +0200
 Subject: [PATCH] mmc: core: set initial signal voltage on power off

projects/Rockchip/patches/linux/rockchip-4.4/linux-0010-dvb.patch

@@ -1,4 +1,4 @@
-From ae39146426642d51de99ba3bdef54912c579991b Mon Sep 17 00:00:00 2001
+From 77d2716cf5579c4ad74df978ad58d983419cc44b Mon Sep 17 00:00:00 2001
 From: Jakub Kicinski <jakub.kicinski@netronome.com>
 Date: Wed, 31 Aug 2016 12:46:44 +0100
 Subject: [PATCH] UPSTREAM: add basic register-field manipulation macros
@@ -167,7 +167,7 @@ index 7f4818673c41..edd3d8d3cd90 100644
  	BUILD_BUG_ON((n) == 0 || (((n) & ((n) - 1)) != 0))
  
 
-From 8c11cf13e9f5c633bc2d1f3414d3b95c9cc82e4c Mon Sep 17 00:00:00 2001
+From 3841d053b087e87d8d3d77738452c3b14d724049 Mon Sep 17 00:00:00 2001
 From: Jakub Kicinski <jakub.kicinski@netronome.com>
 Date: Thu, 9 Feb 2017 09:17:27 -0800
 Subject: [PATCH] UPSTREAM: bitfield.h: add FIELD_FIT() helper
@@ -207,7 +207,7 @@ index f6505d83069d..8b9d6fff002d 100644
   * FIELD_PREP() - prepare a bitfield element
   * @_mask: shifted mask defining the field's length and position
 
-From 9b03f083c3ba2b3ca6dbcfdc76bf24edfe8b2947 Mon Sep 17 00:00:00 2001
+From b0dcc7c8cc60ef7877baf3639a46344d8b184fc7 Mon Sep 17 00:00:00 2001
 From: Laurent Defert <laurent.defert@smartjog.com>
 Date: Wed, 11 Oct 2017 08:46:52 +0200
 Subject: [PATCH] FROMLIST: compat_ioctl: add compat handler for

projects/Rockchip/patches/linux/rockchip-4.4/linux-1000-pl330.patch

@@ -1,4 +1,158 @@
-From 0a3affb0d28223e6ffbdb3ccceeaae1ed7a35b21 Mon Sep 17 00:00:00 2001
+From de1d7ef4900e4083d3eb61a41ef21970cd572a59 Mon Sep 17 00:00:00 2001
+From: Jonas Karlman <jonas@kwiboo.se>
+Date: Sat, 8 Sep 2018 11:03:36 +0200
+Subject: [PATCH] Revert "dmaengine: pl330: add support for interlace single
+ xfer"
+
+This reverts commit 83623425bceb4005151379cc959e41eddd2a0937.
+---
+ drivers/dma/pl330.c | 10 +---------
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
+index b14f5c225401..8746c24d3cd7 100644
+--- a/drivers/dma/pl330.c
++++ b/drivers/dma/pl330.c
+@@ -1477,12 +1477,6 @@ static inline int _setup_loops(struct pl330_dmac *pl330,
+ 		off += _emit_FLUSHP(dry_run, &buf[off],
+ 					pxs->desc->peri);
+ #endif
+-	if (pxs->desc->rqtype == DMA_DEV_TO_MEM)
+-		bursts = x->bytes / (BRST_SIZE(ccr) * BRST_LEN(ccr) +
+-				     pxs->desc->dst_interlace_size);
+-	else if (pxs->desc->rqtype == DMA_MEM_TO_DEV)
+-		bursts = x->bytes / (BRST_SIZE(ccr) * BRST_LEN(ccr) +
+-				     pxs->desc->src_interlace_size);
+ 	while (bursts) {
+ 		c = bursts;
+ 		off += _loop(pl330, dry_run, &buf[off], &c, pxs);
+@@ -1507,9 +1501,7 @@ static inline int _setup_xfer(struct pl330_dmac *pl330,
+ 	/* Setup Loop(s) */
+ 	off += _setup_loops(pl330, dry_run, &buf[off], pxs);
+ 
+-	if (pxs->desc->src_interlace_size == 0 &&
+-	    pxs->desc->dst_interlace_size == 0 &&
+-	    pl330->peripherals_req_type == BURST) {
++	if (pl330->peripherals_req_type == BURST) {
+ 		unsigned int ccr = pxs->ccr;
+ 		unsigned long c = 0;
+ 
+
+From 875fb88fb64f5dc61abb8c4a311de82b68792d0e Mon Sep 17 00:00:00 2001
+From: Jonas Karlman <jonas@kwiboo.se>
+Date: Sat, 1 Sep 2018 07:43:58 +0200
+Subject: [PATCH] Revert "dmaengine: pl330: _loop_cyclic: fixup loopcnt is too
+ large"
+
+This reverts commit 8ea3f97aab1b68b5aa1aece7eb83bef6d08b3c84.
+---
+ drivers/dma/pl330.c | 67 +++++++++++++++++------------------------------------
+ 1 file changed, 21 insertions(+), 46 deletions(-)
+
+diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
+index 8746c24d3cd7..5893c11dd858 100644
+--- a/drivers/dma/pl330.c
++++ b/drivers/dma/pl330.c
+@@ -1341,14 +1341,19 @@ static inline int _loop(struct pl330_dmac *pl330, unsigned dry_run, u8 buf[],
+ 	return off;
+ }
+ 
+-static int _period(struct pl330_dmac *pl330, unsigned int dry_run, u8 buf[],
+-		   unsigned long bursts, const struct _xfer_spec *pxs, int ev)
++/* Returns bytes consumed */
++static inline int _loop_cyclic(struct pl330_dmac *pl330, unsigned dry_run,
++		u8 buf[], unsigned long bursts, const struct _xfer_spec *pxs, int ev)
+ {
+-	unsigned int lcnt1, ljmp1;
+-	int cyc, off = 0;
++	int cyc, off;
++	unsigned lcnt0, lcnt1, ljmp0, ljmp1, ljmpfe;
+ 	struct _arg_LPEND lpend;
+ 	struct pl330_xfer *x = &pxs->desc->px;
+ 
++	off = 0;
++	ljmpfe = off;
++	lcnt0 = pxs->desc->num_periods;
++
+ 	if (bursts > 256) {
+ 		lcnt1 = 256;
+ 		cyc = bursts / 256;
+@@ -1357,6 +1362,18 @@ static int _period(struct pl330_dmac *pl330, unsigned int dry_run, u8 buf[],
+ 		cyc = 1;
+ 	}
+ 
++	/* forever loop */
++	off += _emit_MOV(dry_run, &buf[off], SAR, x->src_addr);
++	off += _emit_MOV(dry_run, &buf[off], DAR, x->dst_addr);
++#ifdef CONFIG_ARCH_ROCKCHIP
++	if (!(pl330->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP))
++		off += _emit_FLUSHP(dry_run, &buf[off],
++					pxs->desc->peri);
++#endif
++	/* loop0 */
++	off += _emit_LP(dry_run, &buf[off], 0,  lcnt0);
++	ljmp0 = off;
++
+ 	/* loop1 */
+ 	off += _emit_LP(dry_run, &buf[off], 1, lcnt1);
+ 	ljmp1 = off;
+@@ -1407,54 +1424,12 @@ static int _period(struct pl330_dmac *pl330, unsigned int dry_run, u8 buf[],
+ 
+ 	off += _emit_SEV(dry_run, &buf[off], ev);
+ 
+-	return off;
+-}
+-
+-/* Returns bytes consumed */
+-static inline int _loop_cyclic(struct pl330_dmac *pl330, unsigned int dry_run,
+-		u8 buf[], unsigned long bursts, const struct _xfer_spec *pxs, int ev)
+-{
+-	int off, periods, residue, i;
+-	unsigned int lcnt0, ljmp0, ljmpfe;
+-	struct _arg_LPEND lpend;
+-	struct pl330_xfer *x = &pxs->desc->px;
+-
+-	off = 0;
+-	ljmpfe = off;
+-	lcnt0 = pxs->desc->num_periods;
+-	periods = 1;
+-
+-	while (lcnt0 > 256) {
+-		periods++;
+-		lcnt0 = pxs->desc->num_periods / periods;
+-	}
+-
+-	residue = pxs->desc->num_periods % periods;
+-
+-	/* forever loop */
+-	off += _emit_MOV(dry_run, &buf[off], SAR, x->src_addr);
+-	off += _emit_MOV(dry_run, &buf[off], DAR, x->dst_addr);
+-#ifdef CONFIG_ARCH_ROCKCHIP
+-	if (!(pl330->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP))
+-		off += _emit_FLUSHP(dry_run, &buf[off],
+-					pxs->desc->peri);
+-#endif
+-	/* loop0 */
+-	off += _emit_LP(dry_run, &buf[off], 0,  lcnt0);
+-	ljmp0 = off;
+-
+-	for (i = 0; i < periods; i++)
+-		off += _period(pl330, dry_run, &buf[off], bursts, pxs, ev);
+-
+ 	lpend.cond = ALWAYS;
+ 	lpend.forever = false;
+ 	lpend.loop = 0;
+ 	lpend.bjump = off - ljmp0;
+ 	off += _emit_LPEND(dry_run, &buf[off], &lpend);
+ 
+-	for (i = 0; i < residue; i++)
+-		off += _period(pl330, dry_run, &buf[off], bursts, pxs, ev);
+-
+ 	lpend.cond = ALWAYS;
+ 	lpend.forever = true;
+ 	lpend.loop = 1;
+
+From b773c238a40773bd6f717701324630a917b67567 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 3 Jun 2018 07:36:35 +0200
 Subject: [PATCH] Revert "dmaengine: pl330: add support for interlace cyclic
@@ -78,7 +232,7 @@ index 5893c11dd858..b4a0d48bafa4 100644
  }
  
 
-From 16aaccef2d6178e8ce9bdb676526301fd071c3d6 Mon Sep 17 00:00:00 2001
+From b933f0eb613228472124849615f5a5e075b8b787 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 3 Jun 2018 07:36:53 +0200
 Subject: [PATCH] Revert "dmaengine: pl330: add support for interlace size
@@ -216,7 +370,7 @@ index 3050f88daf9e..948c17e409e9 100644
  
  /**
 
-From ef7bddfb9e1490a323aa322b3f1719f071720f3b Mon Sep 17 00:00:00 2001
+From 90870281a7399dffb49ff4d631ee9df249c3d0c0 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 4 Feb 2018 10:47:28 +0100
 Subject: [PATCH] Revert "dmaengine: pl330: fix bug that chan descdone is null"
@@ -257,7 +411,7 @@ index babaeace0a8a..6e375d7ec09c 100644
  	}
  
 
-From 0e87104dd4138e358202bc6bad1f6ca2701fb711 Mon Sep 17 00:00:00 2001
+From ca7c03b12f7c113e9f722a02c7acebabb2cccc27 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 4 Feb 2018 10:47:38 +0100
 Subject: [PATCH] Revert "dmaengine: pl330: flush before first loop"
@@ -298,7 +452,7 @@ index 6e375d7ec09c..9664f71dbab2 100644
  		c = bursts;
  		off += _loop(pl330, dry_run, &buf[off], &c, pxs);
 
-From 31a66caa86b6ed3bde555f70d7d6cb351ff60156 Mon Sep 17 00:00:00 2001
+From 7e5d6f86b631c40624eb595910c23e7972783347 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 4 Feb 2018 10:47:51 +0100
 Subject: [PATCH] Revert "dmaengine: pl330: fix 2 bursts transfer when dma
@@ -348,7 +502,7 @@ index 9664f71dbab2..9c3699ad2245 100644
  		if (!(pl330->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP))
  			off += _emit_FLUSHP(dry_run, &buf[off],
 
-From 4429392f7f65d46bac1dd0dda3d8611663acce63 Mon Sep 17 00:00:00 2001
+From 846d1829607d8806fd932fa3f8f4f0eb9e71d241 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 21 Oct 2017 19:49:27 +0200
 Subject: [PATCH] Revert "dmaengine: pl330: _loop_cyclic fix cycles of last
@@ -373,7 +527,7 @@ index 9c3699ad2245..be4ea6e089ae 100644
  			off += _bursts(pl330, dry_run, &buf[off], pxs, 1);
  			lpend.cond = ALWAYS;
 
-From 4bd0efa160df1d9cdfd2fd213b96587cb7961c76 Mon Sep 17 00:00:00 2001
+From f7fdbad73413294e56e632fa8353765b8e205582 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 4 Feb 2018 11:05:44 +0100
 Subject: [PATCH] Revert "dmaengine: pl330: pl330_tasklet init power_down by
@@ -398,7 +552,7 @@ index be4ea6e089ae..2ba795d599fb 100644
  	} else {
  		/* Make sure the PL330 Channel thread is active */
 
-From 2550b832a5aec4d0a2b584bed27a789cb76c2d35 Mon Sep 17 00:00:00 2001
+From 07a5172605729425390855a0b6ced66bfde22ee5 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Fri, 16 Jun 2017 23:14:54 +0200
 Subject: [PATCH] Revert "dmaengine: pl330: _loop_cyclic supports unaligned
@@ -474,7 +628,7 @@ index 2ba795d599fb..e5b3893d441e 100644
  						pxs, thrd->ev);
  	}
 
-From ce768db94e3fb2c33d68ccf90001f725c0c7feb5 Mon Sep 17 00:00:00 2001
+From 5083d82f6622749e07174fe6da32e431068b59cb Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Fri, 16 Jun 2017 23:14:54 +0200
 Subject: [PATCH] Revert "dmaengine: pl330: redefine the cyclic transfer"
@@ -689,7 +843,7 @@ index e5b3893d441e..38c46f4e0408 100644
  	fill_px(&desc->px, dst, src, period_len);
  
 
-From 8ad1819a2e61483c3840d09b9a27f669c7fcb8bc Mon Sep 17 00:00:00 2001
+From e8a5eaffda3179b78b9d1bb619ddf25dd651d134 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Fri, 16 Jun 2017 23:14:54 +0200
 Subject: [PATCH] Revert "dmaengine: pl330: make transfer run infinitely
@@ -1032,7 +1186,7 @@ index 38c46f4e0408..ad9d616551f8 100644
  
  	return &desc->txd;
 
-From ef009783e673113536eb2c9809f3787f5aeef87a Mon Sep 17 00:00:00 2001
+From 0cb8495a963957245b2196e34e404472445a9d3a Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 22 Jul 2018 16:07:46 +0200
 Subject: [PATCH] Revert "dmaengine: pl330: fix error message to
@@ -1059,7 +1213,7 @@ index ad9d616551f8..3d5d91084605 100644
  		goto updt_exit;
  	}
 
-From 45c38c611da7df545138bf436f43e78481a6fa1a Mon Sep 17 00:00:00 2001
+From c32a7b1b9bac8450d9c0ff71b2256714ab32e5c3 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Fri, 16 Jun 2017 23:14:55 +0200
 Subject: [PATCH] Revert "dmaengine: pl330: support transfer that doesn't align
@@ -1119,7 +1273,7 @@ index 3d5d91084605..2f5f8d40147c 100644
  	off += _setup_xfer(pl330, dry_run, &buf[off], pxs);
  
 
-From 0be5f99a27515b375304a2dc85226a2fd3d560cd Mon Sep 17 00:00:00 2001
+From 8a5c2aac1f170e5d8a8cdce3ab147cf641e38981 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Fri, 16 Jun 2017 23:14:55 +0200
 Subject: [PATCH] Revert "dmaengine: pl330: add burst mode according to dts
@@ -1220,7 +1374,7 @@ index 2f5f8d40147c..f7977979cbf5 100644
  	for (i = 0; i < ARRAY_SIZE(of_quirks); i++)
  		if (of_property_read_bool(np, of_quirks[i].quirk))
 
-From a3456e55253a88214f07c72127744eee7e81ede1 Mon Sep 17 00:00:00 2001
+From 31567aa7a43385bbc429eff72855b49c90c2ac97 Mon Sep 17 00:00:00 2001
 From: Vinod Koul <vinod.koul@intel.com>
 Date: Tue, 5 Jul 2016 10:02:16 +0530
 Subject: [PATCH] UPSTREAM: dmaengine: pl330: explicitly freeup irq
@@ -1263,7 +1417,7 @@ index f7977979cbf5..b6793b0d53c9 100644
  
  	/* Idle the DMAC */
 
-From f1fd696d39b9ded57b30f79bbe23317262481a80 Mon Sep 17 00:00:00 2001
+From ba1d527ad2e0ac6b1f60f79b6e15cd2231876367 Mon Sep 17 00:00:00 2001
 From: Stephen Barber <smbarber@chromium.org>
 Date: Thu, 18 Aug 2016 17:59:59 -0700
 Subject: [PATCH] UPSTREAM: dmaengine: pl330: fix residual for non-running BUSY
@@ -1323,7 +1477,7 @@ index b6793b0d53c9..7e05ef5ba37f 100644
  			transferred = 0;
  		residual += desc->bytes_requested - transferred;
 
-From 5cb6529514e53ca8db016137788675be769a75b7 Mon Sep 17 00:00:00 2001
+From c6ddb1c340be89262163fc1f1ddbeff2b7adac7c Mon Sep 17 00:00:00 2001
 From: Hsin-Yu Chao <hychao@chromium.org>
 Date: Tue, 23 Aug 2016 17:16:55 +0800
 Subject: [PATCH] UPSTREAM: dmaengine: pl330: Acquire dmac's spinlock in
@@ -1368,7 +1522,7 @@ index 7e05ef5ba37f..93efdcc54f19 100644
  
  out:
 
-From cd1b3fa8ef7ec0a775321d44d2f5469ffbab7431 Mon Sep 17 00:00:00 2001
+From a2bd9dfc9421a44c86ad35c6b29fc28534917553 Mon Sep 17 00:00:00 2001
 From: Stephen Barber <smbarber@chromium.org>
 Date: Tue, 1 Nov 2016 16:44:27 -0700
 Subject: [PATCH] UPSTREAM: dmaengine: pl330: Handle xferred count if DMAMOV
@@ -1403,7 +1557,7 @@ index 93efdcc54f19..497cc048feaa 100644
  }
  
 
-From 5f387aa530599beb607885a28a5bbf8f50d1dbb6 Mon Sep 17 00:00:00 2001
+From 166204f617a83115d81ffdf34329757b4b1f9fb0 Mon Sep 17 00:00:00 2001
 From: Vladimir Murzin <vladimir.murzin@arm.com>
 Date: Wed, 7 Dec 2016 13:17:40 +0000
 Subject: [PATCH] UPSTREAM: dmaengine: pl330: do not generate unaligned access
@@ -1505,7 +1659,7 @@ index 497cc048feaa..eb274eeda0aa 100644
  	return SZ_DMAGO;
  }
 
-From 90b0d473241a84db9a284123c7357231a0ffd7d2 Mon Sep 17 00:00:00 2001
+From 50165cc7de07efd5986eeb604bbefe6328a142c4 Mon Sep 17 00:00:00 2001
 From: Vinod Koul <vinod.koul@intel.com>
 Date: Fri, 9 Dec 2016 15:24:12 +0530
 Subject: [PATCH] =?UTF-8?q?UPSTREAM:=20dmaengine:=20pl330:=20remove=20unus?=
@@ -1546,7 +1700,7 @@ index eb274eeda0aa..14efb0e4a6a8 100644
  	if ((pl330->pcfg.periph_id & 0xfffff) != PERIPH_ID_VAL) {
  		dev_err(pl330->ddma.dev, "PERIPH_ID 0x%x !\n",
 
-From 10abe915578c8bbd0e2621a255718beecc6a3425 Mon Sep 17 00:00:00 2001
+From 9d2bcf1dd31ccb4cf3486deeda428b5e4211aff7 Mon Sep 17 00:00:00 2001
 From: Marek Szyprowski <m.szyprowski@samsung.com>
 Date: Mon, 27 Mar 2017 07:31:03 +0200
 Subject: [PATCH] UPSTREAM: dmaengine: pl330: remove pdata based initialization
@@ -1725,7 +1879,7 @@ index fe93758e8403..000000000000
 -extern bool pl330_filter(struct dma_chan *chan, void *param);
 -#endif	/* __AMBA_PL330_H_ */
 
-From 1ecb8e7abb5ba82380d83c7951621faeba06389e Mon Sep 17 00:00:00 2001
+From 4ecadbeac3bbd8cd7e2377681b458a4036c33233 Mon Sep 17 00:00:00 2001
 From: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
 Date: Thu, 1 Jun 2017 19:22:01 +0100
 Subject: [PATCH] UPSTREAM: dmaengine: pl330: fix warning in pl330_remove
@@ -1757,7 +1911,7 @@ index 8d6c483663dc..f6a4a89ae8aa 100644
  
  	dma_async_device_unregister(&pl330->ddma);
 
-From 7d8694893a9e8d32c82b52fa589fe1e5660ec590 Mon Sep 17 00:00:00 2001
+From 062d0ddfbc9c08f971870e6ce8636a06b5b6d4d7 Mon Sep 17 00:00:00 2001
 From: Matthias Kaehlcke <mka@chromium.org>
 Date: Thu, 15 Jun 2017 16:55:57 -0700
 Subject: [PATCH] UPSTREAM: dmaengine: pl330: Delete unused functions
@@ -1872,7 +2026,7 @@ index f6a4a89ae8aa..bd4a0c3deaf6 100644
  		enum pl330_cond cond, u8 peri)
  {
 
-From 66625effb6e47117c803249fc0d843eff367f32b Mon Sep 17 00:00:00 2001
+From 5d7da5fbd04fb60500162c823056b836c78ba397 Mon Sep 17 00:00:00 2001
 From: Arvind Yadav <arvind.yadav.cs@gmail.com>
 Date: Wed, 23 Aug 2017 21:57:31 +0530
 Subject: [PATCH] UPSTREAM: dmaengine: pl330: constify amba_id
@@ -1901,7 +2055,7 @@ index bd4a0c3deaf6..63ffb8d1f885 100644
  		.id	= 0x00041330,
  		.mask	= 0x000fffff,
 
-From 32b006c4a5e5af627e8daa773a49da36a5deeced Mon Sep 17 00:00:00 2001
+From 79dd0f02e59662d1f1ce0b118280356ed9e63d65 Mon Sep 17 00:00:00 2001
 From: Alexander Kochetkov <al.kochet@gmail.com>
 Date: Wed, 4 Oct 2017 14:37:23 +0300
 Subject: [PATCH] UPSTREAM: dmaengine: pl330: fix descriptor allocation fail
@@ -2029,7 +2183,7 @@ index 63ffb8d1f885..257492238cea 100644
  
  	INIT_LIST_HEAD(&pd->channels);
 
-From 60af02189c1e3cc3d8e957754ac0f97dc20655f5 Mon Sep 17 00:00:00 2001
+From a285cd8b8945bbe899f23e90c98d54249903e7bf Mon Sep 17 00:00:00 2001
 From: Frank Mori Hess <fmh6jj@gmail.com>
 Date: Wed, 18 Apr 2018 20:31:06 -0400
 Subject: [PATCH] UPSTREAM: dmaengine: pl330: flush before wait, and add dev
@@ -2388,7 +2542,7 @@ index 257492238cea..fd48c031ead8 100644
  		desc->bytes_requested = sg_dma_len(sg);
  	}
 
-From b970d8fda69d56f0c9b59e436493bbbc6448ef10 Mon Sep 17 00:00:00 2001
+From 058373c4d717d3a353bca1345ea90f8ca6531136 Mon Sep 17 00:00:00 2001
 From: Marek Szyprowski <m.szyprowski@samsung.com>
 Date: Tue, 19 Jun 2018 15:20:50 +0200
 Subject: [PATCH] UPSTREAM: dmaengine: pl330: report BURST residue granularity
@@ -2417,3 +2571,140 @@ index fd48c031ead8..029bd0444137 100644
  	pd->max_burst = ((pl330->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP) ?
  			 1 : PL330_MAX_BURST);
  
+
+From 05fa0eafd6eda3e61ac5d4a9511eb4d1bb1924f9 Mon Sep 17 00:00:00 2001
+From: Vinod Koul <vkoul@kernel.org>
+Date: Mon, 9 Jul 2018 17:09:58 +0530
+Subject: [PATCH] dmaengine: pl330: Mark expected switch fall-through
+
+In preparation to enabling -Wimplicit-fallthrough, mark switch cases
+where we are expecting to fall through.
+
+Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
+Signed-off-by: Vinod Koul <vkoul@kernel.org>
+(cherry picked from commit bbcb87555869cb6c249bf00d13d3bc400c476c84)
+---
+ drivers/dma/pl330.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
+index 029bd0444137..c3bd238b0c22 100644
+--- a/drivers/dma/pl330.c
++++ b/drivers/dma/pl330.c
+@@ -1047,13 +1047,16 @@ static bool _start(struct pl330_thread *thrd)
+ 
+ 		if (_state(thrd) == PL330_STATE_KILLING)
+ 			UNTIL(thrd, PL330_STATE_STOPPED)
++		/* fall through */
+ 
+ 	case PL330_STATE_FAULTING:
+ 		_stop(thrd);
++		/* fall through */
+ 
+ 	case PL330_STATE_KILLING:
+ 	case PL330_STATE_COMPLETING:
+ 		UNTIL(thrd, PL330_STATE_STOPPED)
++		/* fall through */
+ 
+ 	case PL330_STATE_STOPPED:
+ 		return _trigger(thrd);
+
+From b654bf6ca9ee98bab1a3c55ebd359f251b9c1a61 Mon Sep 17 00:00:00 2001
+From: Vinod Koul <vkoul@kernel.org>
+Date: Mon, 9 Jul 2018 20:08:48 +0530
+Subject: [PATCH] dmaengine: pl330: remove set but unused variable
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Compiler complains (with W=1):
+drivers/dma/pl330.c: In function ‘pl330_release_channel’:
+drivers/dma/pl330.c:1782:21: warning:
+	variable ‘pl330’ set but not used [-Wunused-but-set-variable]
+  struct pl330_dmac *pl330;
+                     ^~~~~
+
+Remove the pl330 variable in pl330_release_channel as it is set but
+never used.
+
+Signed-off-by: Vinod Koul <vkoul@kernel.org>
+(cherry picked from commit 2f903bab92dea8dec8c93e4fa3c7c5295ef0a0fe)
+---
+ drivers/dma/pl330.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
+index c3bd238b0c22..a25ab357b87c 100644
+--- a/drivers/dma/pl330.c
++++ b/drivers/dma/pl330.c
+@@ -1783,8 +1783,6 @@ static inline void _free_event(struct pl330_thread *thrd, int ev)
+ 
+ static void pl330_release_channel(struct pl330_thread *thrd)
+ {
+-	struct pl330_dmac *pl330;
+-
+ 	if (!thrd || thrd->free)
+ 		return;
+ 
+@@ -1793,8 +1791,6 @@ static void pl330_release_channel(struct pl330_thread *thrd)
+ 	dma_pl330_rqcb(thrd->req[1 - thrd->lstenq].desc, PL330_ERR_ABORT);
+ 	dma_pl330_rqcb(thrd->req[thrd->lstenq].desc, PL330_ERR_ABORT);
+ 
+-	pl330 = thrd->dmac;
+-
+ 	_free_event(thrd, thrd->ev);
+ 	thrd->free = true;
+ }
+
+From 31c885c621005218388ca68648dec38d2ea3f9a2 Mon Sep 17 00:00:00 2001
+From: John Keeping <john@metanate.com>
+Date: Tue, 17 Jul 2018 11:48:16 +0100
+Subject: [PATCH] dmaengine: pl330: fix irq race with terminate_all
+
+In pl330_update() when checking if a channel has been aborted, the
+channel's lock is not taken, only the overall pl330_dmac lock.  But in
+pl330_terminate_all() the aborted flag (req_running==-1) is set under
+the channel lock and not the pl330_dmac lock.
+
+With threaded interrupts, this leads to a potential race:
+
+    pl330_terminate_all	        pl330_update
+    -------------------         ------------
+    lock channel
+                                entry
+    lock pl330
+    _stop channel
+    unlock pl330
+                                lock pl330
+                                check req_running != -1
+    req_running = -1
+                                _start channel
+
+Signed-off-by: John Keeping <john@metanate.com>
+Signed-off-by: Vinod Koul <vkoul@kernel.org>
+(cherry picked from commit e49756544a21f5625b379b3871d27d8500764670)
+---
+ drivers/dma/pl330.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
+index a25ab357b87c..5b0aef7d1f80 100644
+--- a/drivers/dma/pl330.c
++++ b/drivers/dma/pl330.c
+@@ -2209,13 +2209,14 @@ static int pl330_terminate_all(struct dma_chan *chan)
+ 
+ 	pm_runtime_get_sync(pl330->ddma.dev);
+ 	spin_lock_irqsave(&pch->lock, flags);
++
+ 	spin_lock(&pl330->lock);
+ 	_stop(pch->thread);
+-	spin_unlock(&pl330->lock);
+-
+ 	pch->thread->req[0].desc = NULL;
+ 	pch->thread->req[1].desc = NULL;
+ 	pch->thread->req_running = -1;
++	spin_unlock(&pl330->lock);
++
+ 	power_down = pch->active;
+ 	pch->active = false;
+ 

projects/Rockchip/patches/linux/rockchip-4.4/linux-1000-vcodec.patch

@@ -1,4 +1,4 @@
-From 499f15c3237602cca9ccebe902d31bd7404fb2db Mon Sep 17 00:00:00 2001
+From e222e9913d3c70967bae92f1aed46de726974dc7 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Thu, 5 Jul 2018 00:14:14 +0200
 Subject: [PATCH] Revert "drm/drm-prime: cache dma_buf import context"
@@ -124,7 +124,7 @@ index 273a52b5eb66..85bbd19c87b0 100644
  		rockchip_gem_free_buf(rk_obj);
  	}
 
-From 3dd29985f5f1cec249c833b1b2ca33e131f79825 Mon Sep 17 00:00:00 2001
+From 0868438e92b0e9a44d6c6e711ef3be0a429ab4af Mon Sep 17 00:00:00 2001
 From: Rob Clark <robdclark@gmail.com>
 Date: Thu, 9 Jun 2016 15:29:19 -0400
 Subject: [PATCH] UPSTREAM: drm/prime: fix error path deadlock fail
@@ -187,7 +187,7 @@ index 6b7417a194a3..d8d85286764d 100644
  }
  EXPORT_SYMBOL(drm_gem_prime_fd_to_handle);
 
-From a689159fac372a8210d2c63ba63da3a097388b97 Mon Sep 17 00:00:00 2001
+From 8e4ac090d0a814f73d719887f96f7dc44112e03e Mon Sep 17 00:00:00 2001
 From: Chris Wilson <chris@chris-wilson.co.uk>
 Date: Mon, 26 Sep 2016 21:44:14 +0100
 Subject: [PATCH] UPSTREAM: drm: Convert prime dma-buf <-> handle to rbtree
@@ -411,7 +411,7 @@ index 04edcd32b409..93da65df2e7e 100644
  
  /** File private data */
 
-From f977098a9a02ac2df267eafe860370cb4c407d69 Mon Sep 17 00:00:00 2001
+From fcb8af30f524cd437434ec6ddea0231cc37529bc Mon Sep 17 00:00:00 2001
 From: Chris Wilson <chris@chris-wilson.co.uk>
 Date: Wed, 5 Oct 2016 13:21:44 +0100
 Subject: [PATCH] UPSTREAM: drm/prime: Take a ref on the drm_dev when exporting
@@ -588,7 +588,7 @@ index 93da65df2e7e..4aba6478d718 100644
  
  extern int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page **pages,
 
-From f30ee0d19425a6c21a9959513e482282ba08dd6a Mon Sep 17 00:00:00 2001
+From 2c0a8737dd35ba259d3bbbf1b956fb43da32f117 Mon Sep 17 00:00:00 2001
 From: Chris Wilson <chris@chris-wilson.co.uk>
 Date: Wed, 7 Dec 2016 21:45:27 +0000
 Subject: [PATCH] UPSTREAM: drm: Take ownership of the dmabuf->obj when
@@ -648,7 +648,7 @@ index 94b4872255c8..dbd34fa7f71c 100644
  	return dmabuf;
  }
 
-From a1fe1ad6076ec27f60555a9393f40959cea94bff Mon Sep 17 00:00:00 2001
+From 595e921b1e908458bd1ee022c9a7ee08cf203ad9 Mon Sep 17 00:00:00 2001
 From: Lucas Stach <l.stach@pengutronix.de>
 Date: Thu, 30 Nov 2017 18:34:28 +0100
 Subject: [PATCH] UPSTREAM: drm/prime: skip CPU sync in map/unmap dma_buf
@@ -704,7 +704,7 @@ index dbd34fa7f71c..133362279591 100644
  			kfree(sgt);
  			sgt = ERR_PTR(-ENOMEM);
 
-From bdfc956545f8292cf462a7feee96d811f5d34414 Mon Sep 17 00:00:00 2001
+From d314fd1a48e930d034eccd49342a23340c3f1c27 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig.leichtzumerken@gmail.com>
 Date: Tue, 27 Feb 2018 12:49:56 +0100
 Subject: [PATCH] UPSTREAM: drm/prime: fix potential race in drm_gem_map_detach
@@ -776,7 +776,7 @@ index 133362279591..95ecc69d03a0 100644
  
  void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *prime_fpriv,
 
-From 54f13f6370c654d59a9a5938e5953888a65c1980 Mon Sep 17 00:00:00 2001
+From c74449bbd7e3ee3f3195ac9da48271c83c56f101 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig.leichtzumerken@gmail.com>
 Date: Tue, 27 Feb 2018 12:49:57 +0100
 Subject: [PATCH] UPSTREAM: drm/prime: make the pages array optional for
@@ -856,7 +856,7 @@ index 95ecc69d03a0..7ea65c4105c1 100644
  	}
  	return 0;
 
-From c5e39a7e46511dffadabea97e3d74310561d1ba0 Mon Sep 17 00:00:00 2001
+From 2fc969d64eb928db78c9fd99fb68d9d2442a8919 Mon Sep 17 00:00:00 2001
 From: Chris Wilson <chris@chris-wilson.co.uk>
 Date: Sat, 19 Aug 2017 13:05:58 +0100
 Subject: [PATCH] UPSTREAM: drm: Release driver tracking before making the
@@ -912,7 +912,7 @@ index d7f39a03c2c9..966ea63581b1 100644
  
  	return 0;
 
-From 42f26aa9c8d429886b0af174b740f72741e571e2 Mon Sep 17 00:00:00 2001
+From 1d9b65acb4e776f43408afed2b0fd7b86fdb95ce Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 17 Feb 2018 05:30:36 +0100
 Subject: [PATCH] vcodec: skip reduce freq
@@ -922,10 +922,10 @@ Subject: [PATCH] vcodec: skip reduce freq
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/drivers/video/rockchip/vcodec/vcodec_service.c b/drivers/video/rockchip/vcodec/vcodec_service.c
-index 0f177d9ab4c2..903ea8554649 100644
+index c4ee73be92d3..9d5ee5c8b1f9 100644
 --- a/drivers/video/rockchip/vcodec/vcodec_service.c
 +++ b/drivers/video/rockchip/vcodec/vcodec_service.c
-@@ -1602,9 +1602,6 @@ static void try_set_reg(struct vpu_subdev_data *data)
+@@ -1630,9 +1630,6 @@ static void try_set_reg(struct vpu_subdev_data *data)
  			reg_from_wait_to_run(pservice, reg);
  			reg_copy_to_hw(reg->data, reg);
  		}
@@ -935,7 +935,7 @@ index 0f177d9ab4c2..903ea8554649 100644
  	}
  
  	mutex_unlock(&pservice->shutdown_lock);
-@@ -2353,6 +2350,7 @@ static void vcodec_set_freq_rk3328(struct vpu_service_info *pservice,
+@@ -2385,6 +2382,7 @@ static void vcodec_set_freq_rk3328(struct vpu_service_info *pservice,
  	if (curr == reg->freq)
  		return;