Merge branch 'master' of https://github.com/armbian/build

config/kernel/linux-meson-default.config

@@ -3959,7 +3959,10 @@ CONFIG_REISERFS_FS_XATTR=y
 CONFIG_REISERFS_FS_POSIX_ACL=y
 CONFIG_REISERFS_FS_SECURITY=y
 # CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
+CONFIG_XFS_FS=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=m

config/kernel/linux-mvebu64-dev.config

@@ -1066,7 +1066,8 @@ CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
-# CONFIG_NF_TABLES_IPV4 is not set
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 # CONFIG_NF_TABLES_ARP is not set
 CONFIG_NF_FLOW_TABLE_IPV4=m
 CONFIG_NF_DUP_IPV4=m
@@ -1075,6 +1076,8 @@ CONFIG_NF_LOG_IPV4=m
 CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_NAT_IPV4=m
 CONFIG_NF_NAT_MASQUERADE_IPV4=y
+CONFIG_NFT_CHAIN_NAT_IPV4=m
+CONFIG_NFT_MASQ_IPV4=m
 CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NF_NAT_PROTO_GRE=m
 CONFIG_NF_NAT_PPTP=m
@@ -4613,7 +4616,10 @@ CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
+CONFIG_XFS_FS=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=y

config/kernel/linux-mvebu64-next.config

@@ -2243,8 +2243,8 @@ CONFIG_DM_RAID=m
 CONFIG_NETDEVICES=y
 CONFIG_MII=y
 CONFIG_NET_CORE=y
-CONFIG_BONDING=y
-CONFIG_DUMMY=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
 # CONFIG_EQUALIZER is not set
 # CONFIG_NET_FC is not set
 CONFIG_IFB=m
@@ -4894,7 +4894,10 @@ CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
+CONFIG_XFS_FS=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=y

config/kernel/linux-odroidc1-default.config

@@ -3927,7 +3927,10 @@ CONFIG_REISERFS_FS_XATTR=y
 CONFIG_REISERFS_FS_POSIX_ACL=y
 CONFIG_REISERFS_FS_SECURITY=y
 # CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
+CONFIG_XFS_FS=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=m

config/kernel/linux-odroidc1-next.config

@@ -5566,7 +5566,10 @@ CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
+CONFIG_XFS_FS=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=y

config/kernel/linux-pine64-default.config

@@ -3153,7 +3153,10 @@ CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
+CONFIG_XFS_FS=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_BTRFS_FS is not set

config/kernel/linux-rockchip64-dev.config

@@ -5856,7 +5856,10 @@ CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
+CONFIG_XFS_FS=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=m

config/kernel/linux-sun5i-default.config

@@ -2042,7 +2042,10 @@ CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
+CONFIG_XFS_FS=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_BTRFS_FS is not set

config/kernel/linux-sunxi-dev.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.19.11 Kernel Configuration
+# Linux/arm 4.20.2 Kernel Configuration
 #
 
 #
@@ -92,6 +92,7 @@ CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
+# CONFIG_PSI is not set
 CONFIG_CPU_ISOLATION=y
 
 #
@@ -490,7 +491,6 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 CONFIG_CPUFREQ_DT=m
 CONFIG_CPUFREQ_DT_PLATDEV=y
 CONFIG_ARM_BIG_LITTLE_CPUFREQ=m
-CONFIG_ARM_DT_BL_CPUFREQ=m
 # CONFIG_QORIQ_CPUFREQ is not set
 
 #
@@ -670,6 +670,7 @@ CONFIG_BLK_WBT_MQ=y
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_MSDOS_PARTITION=y
 CONFIG_EFI_PARTITION=y
+CONFIG_BLK_PM=y
 
 #
 # IO Schedulers
@@ -718,8 +719,6 @@ CONFIG_COREDUMP=y
 #
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_HAVE_MEMBLOCK=y
-CONFIG_NO_BOOTMEM=y
 CONFIG_MEMORY_ISOLATION=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_COMPACTION=y
@@ -947,6 +946,7 @@ CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
+CONFIG_NFT_XFRM=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
@@ -1254,6 +1254,7 @@ CONFIG_NET_DSA=m
 CONFIG_NET_DSA_LEGACY=y
 CONFIG_NET_DSA_TAG_BRCM=y
 CONFIG_NET_DSA_TAG_BRCM_PREPEND=y
+CONFIG_NET_DSA_TAG_GSWIP=y
 CONFIG_VLAN_8021Q=y
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
@@ -1302,6 +1303,7 @@ CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SCH_TBF=m
 # CONFIG_NET_SCH_CBS is not set
 CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_TAPRIO=m
 CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCH_NETEM=m
@@ -1376,6 +1378,7 @@ CONFIG_BATMAN_ADV_DAT=y
 CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_MCAST=y
 # CONFIG_BATMAN_ADV_DEBUGFS is not set
+# CONFIG_BATMAN_ADV_TRACING is not set
 CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=m
 CONFIG_OPENVSWITCH_VXLAN=m
@@ -1529,7 +1532,7 @@ CONFIG_AF_RXRPC=m
 # CONFIG_AF_RXRPC_DEBUG is not set
 # CONFIG_RXKAD is not set
 CONFIG_AF_KCM=m
-CONFIG_STREAM_PARSER=m
+CONFIG_STREAM_PARSER=y
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_EXT=y
@@ -1553,8 +1556,6 @@ CONFIG_LIB80211_CRYPT_CCMP=m
 CONFIG_MAC80211=m
 CONFIG_MAC80211_HAS_RC=y
 CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_MINSTREL_HT=y
-# CONFIG_MAC80211_RC_MINSTREL_VHT is not set
 CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
 CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
 CONFIG_MAC80211_MESH=y
@@ -1620,6 +1621,7 @@ CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPI=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
+CONFIG_REGMAP_SCCB=m
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
 CONFIG_DMA_CMA=y
@@ -1723,7 +1725,6 @@ CONFIG_MTD_NAND=y
 # CONFIG_MTD_NAND_DENALI_DT is not set
 CONFIG_MTD_NAND_GPIO=y
 # CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_DOCG4 is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
 # CONFIG_MTD_NAND_BRCMNAND is not set
 CONFIG_MTD_NAND_PLATFORM=y
@@ -1826,6 +1827,7 @@ CONFIG_EEPROM_AT24=m
 CONFIG_EEPROM_93CX6=m
 # CONFIG_EEPROM_93XX46 is not set
 CONFIG_EEPROM_IDT_89HPESX=m
+CONFIG_EEPROM_EE1004=m
 
 #
 # Texas Instruments shared transport line discipline
@@ -1965,7 +1967,6 @@ CONFIG_BCACHE=m
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_MQ_DEFAULT is not set
 # CONFIG_DM_DEBUG is not set
 CONFIG_DM_BUFIO=m
 # CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
@@ -2039,8 +2040,10 @@ CONFIG_B53_SPI_DRIVER=m
 CONFIG_B53_MDIO_DRIVER=m
 CONFIG_B53_MMAP_DRIVER=m
 CONFIG_B53_SRAB_DRIVER=m
+CONFIG_B53_SERDES=m
 # CONFIG_NET_DSA_BCM_SF2 is not set
 # CONFIG_NET_DSA_LOOP is not set
+CONFIG_NET_DSA_LANTIQ_GSWIP=m
 # CONFIG_NET_DSA_MT7530 is not set
 # CONFIG_NET_DSA_MV88E6060 is not set
 # CONFIG_MICROCHIP_KSZ is not set
@@ -2095,6 +2098,7 @@ CONFIG_NET_VENDOR_MICROSEMI=y
 # CONFIG_NET_VENDOR_NATSEMI is not set
 CONFIG_NET_VENDOR_NETRONOME=y
 CONFIG_NET_VENDOR_NI=y
+CONFIG_NI_XGE_MANAGEMENT_ENET=m
 # CONFIG_ETHOC is not set
 CONFIG_NET_VENDOR_QUALCOMM=y
 # CONFIG_QCA7000_SPI is not set
@@ -2322,8 +2326,11 @@ CONFIG_MT7601U=m
 CONFIG_MT76_CORE=m
 CONFIG_MT76_LEDS=y
 CONFIG_MT76_USB=m
-CONFIG_MT76x2_COMMON=m
+CONFIG_MT76x02_LIB=m
+CONFIG_MT76x02_USB=m
+CONFIG_MT76x0_COMMON=m
 CONFIG_MT76x0U=m
+CONFIG_MT76x2_COMMON=m
 CONFIG_MT76x2U=m
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
@@ -2384,6 +2391,7 @@ CONFIG_USB_NET_RNDIS_WLAN=m
 CONFIG_NETDEVSIM=m
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
+# CONFIG_NVM is not set
 
 #
 # Input device support
@@ -3156,6 +3164,7 @@ CONFIG_MFD_SUN4I_GPADC=m
 # CONFIG_MFD_AS3722 is not set
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_MFD_AAT2870_CORE is not set
+CONFIG_MFD_AT91_USART=m
 # CONFIG_MFD_ATMEL_FLEXCOM is not set
 # CONFIG_MFD_ATMEL_HLCDC is not set
 # CONFIG_MFD_BCM590XX is not set
@@ -3349,6 +3358,7 @@ CONFIG_MEDIA_SDR_SUPPORT=y
 # CONFIG_CEC_PIN_ERROR_INJ is not set
 CONFIG_MEDIA_CONTROLLER=y
 # CONFIG_MEDIA_CONTROLLER_DVB is not set
+# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
 CONFIG_VIDEO_DEV=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_VIDEO_V4L2=y
@@ -3690,6 +3700,8 @@ CONFIG_VIDEO_THS8200=m
 #
 # CONFIG_VIDEO_IMX258 is not set
 # CONFIG_VIDEO_IMX274 is not set
+CONFIG_VIDEO_IMX319=m
+CONFIG_VIDEO_IMX355=m
 # CONFIG_VIDEO_OV2640 is not set
 # CONFIG_VIDEO_OV2659 is not set
 CONFIG_VIDEO_OV2680=m
@@ -3955,6 +3967,7 @@ CONFIG_DVB_TUNER_DIB0090=m
 #
 CONFIG_DVB_DRX39XYJ=m
 CONFIG_DVB_LNBH25=m
+CONFIG_DVB_LNBH29=m
 CONFIG_DVB_LNBP21=m
 CONFIG_DVB_LNBP22=m
 CONFIG_DVB_ISL6405=m
@@ -3996,6 +4009,7 @@ CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
+# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 # CONFIG_DRM_DP_CEC is not set
 CONFIG_DRM_TTM=m
@@ -4080,8 +4094,10 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_SII902X is not set
 # CONFIG_DRM_SII9234 is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
+CONFIG_DRM_TOSHIBA_TC358764=m
 # CONFIG_DRM_TOSHIBA_TC358767 is not set
 # CONFIG_DRM_TI_TFP410 is not set
+CONFIG_DRM_TI_SN65DSI86=m
 CONFIG_DRM_ANALOGIX_DP_I2C=m
 # CONFIG_DRM_ANALOGIX_ANX78XX is not set
 CONFIG_DRM_ANALOGIX_ANX6345=m
@@ -4110,10 +4126,10 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 #
 # Frame buffer Devices
 #
-CONFIG_FB=y
-# CONFIG_FIRMWARE_EDID is not set
 CONFIG_FB_CMDLINE=y
 CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
@@ -4137,7 +4153,6 @@ CONFIG_FB_BACKLIGHT=y
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_METRONOME is not set
-# CONFIG_FB_BROADSHEET is not set
 CONFIG_FB_SIMPLE=y
 # CONFIG_FB_SSD1307 is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
@@ -4150,8 +4165,6 @@ CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_TDO24M is not set
 # CONFIG_LCD_VGG2432A4 is not set
 # CONFIG_LCD_PLATFORM is not set
-# CONFIG_LCD_S6E63M0 is not set
-# CONFIG_LCD_LD9040 is not set
 # CONFIG_LCD_AMS369FG06 is not set
 # CONFIG_LCD_LMS501KF03 is not set
 # CONFIG_LCD_HX8357 is not set
@@ -4309,6 +4322,7 @@ CONFIG_SND_SOC_CS35L35=m
 # CONFIG_SND_SOC_CS43130 is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_DMIC=m
 # CONFIG_SND_SOC_ES7134 is not set
 CONFIG_SND_SOC_ES7241=m
 # CONFIG_SND_SOC_ES8316 is not set
@@ -4317,6 +4331,7 @@ CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328_SPI=m
 # CONFIG_SND_SOC_GTM601 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_MAX98088=m
 # CONFIG_SND_SOC_MAX98504 is not set
 CONFIG_SND_SOC_MAX9867=m
 # CONFIG_SND_SOC_MAX98927 is not set
@@ -4331,6 +4346,9 @@ CONFIG_SND_SOC_PCM1789_I2C=m
 CONFIG_SND_SOC_PCM186X=m
 CONFIG_SND_SOC_PCM186X_I2C=m
 CONFIG_SND_SOC_PCM186X_SPI=m
+CONFIG_SND_SOC_PCM3060=m
+CONFIG_SND_SOC_PCM3060_I2C=m
+CONFIG_SND_SOC_PCM3060_SPI=m
 # CONFIG_SND_SOC_PCM3168A_I2C is not set
 # CONFIG_SND_SOC_PCM3168A_SPI is not set
 # CONFIG_SND_SOC_PCM512x_I2C is not set
@@ -4391,6 +4409,7 @@ CONFIG_SND_SOC_MAX9759=m
 # CONFIG_SND_SOC_MT6351 is not set
 CONFIG_SND_SOC_NAU8540=m
 # CONFIG_SND_SOC_NAU8810 is not set
+CONFIG_SND_SOC_NAU8822=m
 CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_TPA6130A2 is not set
 CONFIG_SND_SIMPLE_CARD_UTILS=m
@@ -4421,6 +4440,7 @@ CONFIG_HID_APPLEIR=m
 CONFIG_HID_AUREAL=m
 CONFIG_HID_BELKIN=m
 CONFIG_HID_BETOP_FF=m
+CONFIG_HID_BIGBEN_FF=m
 CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 CONFIG_HID_CORSAIR=m
@@ -4440,7 +4460,6 @@ CONFIG_HID_GEMBIRD=m
 CONFIG_HID_GFRM=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
-CONFIG_HID_GOOGLE_HAMMER=m
 CONFIG_HID_GT683R=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
@@ -4815,6 +4834,7 @@ CONFIG_USB_G_HID=m
 # CONFIG_USB_G_DBGP is not set
 CONFIG_USB_G_WEBCAM=m
 # CONFIG_TYPEC is not set
+CONFIG_USB_ROLE_SWITCH=m
 # CONFIG_USB_LED_TRIG is not set
 CONFIG_USB_ULPI_BUS=m
 # CONFIG_UWB is not set
@@ -4852,6 +4872,7 @@ CONFIG_LEDS_CLASS_FLASH=m
 # LED drivers
 #
 # CONFIG_LEDS_AAT1290 is not set
+CONFIG_LEDS_AN30259A=m
 # CONFIG_LEDS_AS3645A is not set
 # CONFIG_LEDS_BCM6328 is not set
 # CONFIG_LEDS_BCM6358 is not set
@@ -4915,6 +4936,7 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=m
 CONFIG_LEDS_TRIGGER_CAMERA=m
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGER_NETDEV=m
+CONFIG_LEDS_TRIGGER_PATTERN=m
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 CONFIG_EDAC_ATOMIC_SCRUB=y
@@ -5059,6 +5081,7 @@ CONFIG_ASYNC_TX_DMA=y
 #
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
+# CONFIG_UDMABUF is not set
 # CONFIG_AUXDISPLAY is not set
 # CONFIG_PANEL is not set
 CONFIG_UIO=m
@@ -5142,6 +5165,7 @@ CONFIG_AD9834=m
 # CONFIG_SPEAKUP is not set
 CONFIG_STAGING_MEDIA=y
 CONFIG_I2C_BCM2048=m
+CONFIG_VIDEO_SUNXI=y
 
 #
 # Android
@@ -5214,6 +5238,7 @@ CONFIG_EROFS_FS_POSIX_ACL=y
 # CONFIG_EROFS_FS_SECURITY is not set
 # CONFIG_EROFS_FS_USE_VM_MAP_RAM is not set
 # CONFIG_EROFS_FAULT_INJECTION is not set
+CONFIG_EROFS_FS_IO_MAX_RETRIES=5
 # CONFIG_EROFS_FS_ZIP is not set
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
@@ -5369,6 +5394,9 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 CONFIG_ADXL345=m
 CONFIG_ADXL345_I2C=m
 CONFIG_ADXL345_SPI=m
+CONFIG_ADXL372=m
+CONFIG_ADXL372_SPI=m
+CONFIG_ADXL372_I2C=m
 # CONFIG_BMA180 is not set
 # CONFIG_BMA220 is not set
 # CONFIG_BMC150_ACCEL is not set
@@ -5426,6 +5454,7 @@ CONFIG_MAX1118=m
 # CONFIG_MAX9611 is not set
 # CONFIG_MCP320X is not set
 # CONFIG_MCP3422 is not set
+CONFIG_MCP3911=m
 # CONFIG_NAU7802 is not set
 # CONFIG_SD_ADC_MODULATOR is not set
 CONFIG_SUN4I_GPADC=m
@@ -5491,6 +5520,7 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m
 # CONFIG_AD5593R is not set
 # CONFIG_AD5504 is not set
 # CONFIG_AD5624R_SPI is not set
+CONFIG_LTC1660=m
 CONFIG_LTC2632=m
 # CONFIG_AD5686_SPI is not set
 # CONFIG_AD5696_I2C is not set
@@ -5705,6 +5735,7 @@ CONFIG_ISL29501=m
 # CONFIG_SRF04 is not set
 # CONFIG_SX9500 is not set
 CONFIG_SRF08=m
+CONFIG_VL53L0X_I2C=m
 
 #
 # Resolver to digital converters
@@ -5750,10 +5781,12 @@ CONFIG_PHY_SUN4I_USB=y
 CONFIG_PHY_SUN9I_USB=y
 CONFIG_PHY_SUN50I_USB3=m
 # CONFIG_BCM_KONA_USB2_PHY is not set
+CONFIG_PHY_CADENCE_DP=m
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_CPCAP_USB is not set
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
+CONFIG_PHY_OCELOT_SERDES=m
 CONFIG_PHY_QCOM_USB_HS=m
 # CONFIG_PHY_QCOM_USB_HSIC is not set
 CONFIG_PHY_SAMSUNG_USB2=m
@@ -5783,6 +5816,8 @@ CONFIG_NVMEM_SUNXI_SID=y
 # HW tracing support
 #
 CONFIG_STM=m
+CONFIG_STM_PROTO_BASIC=m
+CONFIG_STM_PROTO_SYS_T=m
 CONFIG_STM_DUMMY=m
 CONFIG_STM_SOURCE_CONSOLE=m
 # CONFIG_STM_SOURCE_HEARTBEAT is not set
@@ -5832,7 +5867,13 @@ CONFIG_JFS_POSIX_ACL=y
 # CONFIG_JFS_SECURITY is not set
 # CONFIG_JFS_DEBUG is not set
 # CONFIG_JFS_STATISTICS is not set
-# CONFIG_XFS_FS is not set
+CONFIG_XFS_FS=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_ONLINE_SCRUB is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=y
@@ -5954,6 +5995,7 @@ CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_UBIFS_FS_XATTR=y
 # CONFIG_UBIFS_FS_ENCRYPTION is not set
 CONFIG_UBIFS_FS_SECURITY=y
+# CONFIG_UBIFS_FS_AUTHENTICATION is not set
 # CONFIG_CRAMFS is not set
 CONFIG_SQUASHFS=m
 CONFIG_SQUASHFS_FILE_CACHE=y
@@ -5980,24 +6022,6 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_PSTORE is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-CONFIG_AUFS_FS=m
-CONFIG_AUFS_BRANCH_MAX_127=y
-# CONFIG_AUFS_BRANCH_MAX_511 is not set
-# CONFIG_AUFS_BRANCH_MAX_1023 is not set
-# CONFIG_AUFS_BRANCH_MAX_32767 is not set
-CONFIG_AUFS_SBILIST=y
-# CONFIG_AUFS_HNOTIFY is not set
-# CONFIG_AUFS_EXPORT is not set
-# CONFIG_AUFS_XATTR is not set
-# CONFIG_AUFS_FHSM is not set
-# CONFIG_AUFS_RDU is not set
-# CONFIG_AUFS_DIRREN is not set
-# CONFIG_AUFS_SHWH is not set
-# CONFIG_AUFS_BR_RAMFS is not set
-# CONFIG_AUFS_BR_FUSE is not set
-CONFIG_AUFS_BR_HFSPLUS=y
-CONFIG_AUFS_BDEV_LOOP=y
-# CONFIG_AUFS_DEBUG is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V2=y
@@ -6161,7 +6185,6 @@ CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_MCRYPTD=m
 CONFIG_CRYPTO_AUTHENC=y
 # CONFIG_CRYPTO_TEST is not set
 CONFIG_CRYPTO_SIMD=m
@@ -6189,6 +6212,7 @@ CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_OFB=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_XTS=y
 CONFIG_CRYPTO_KEYWRAP=m
@@ -6282,6 +6306,7 @@ CONFIG_CRYPTO_DEV_CCREE=m
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
 CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
 CONFIG_PKCS7_MESSAGE_PARSER=y
 # CONFIG_PKCS7_TEST_KEY is not set
 # CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
@@ -6555,6 +6580,7 @@ CONFIG_TEST_HEXDUMP=m
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BITFIELD is not set
 # CONFIG_TEST_UUID is not set
+CONFIG_TEST_XARRAY=m
 CONFIG_TEST_OVERFLOW=m
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_TEST_HASH is not set
@@ -6568,6 +6594,7 @@ CONFIG_TEST_IDA=m
 # CONFIG_TEST_UDELAY is not set
 # CONFIG_TEST_STATIC_KEYS is not set
 # CONFIG_TEST_KMOD is not set
+CONFIG_TEST_MEMCAT_P=m
 # CONFIG_MEMTEST is not set
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
 # CONFIG_SAMPLES is not set
@@ -6578,6 +6605,7 @@ CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 # CONFIG_STRICT_DEVMEM is not set
 # CONFIG_ARM_PTDUMP_DEBUGFS is not set
 # CONFIG_DEBUG_WX is not set
+CONFIG_UNWINDER_ARM=y
 CONFIG_ARM_UNWIND=y
 # CONFIG_DEBUG_USER is not set
 CONFIG_DEBUG_LL=y

config/kernel/linux-sunxi-next.config

@@ -5832,7 +5832,13 @@ CONFIG_JFS_POSIX_ACL=y
 # CONFIG_JFS_SECURITY is not set
 # CONFIG_JFS_DEBUG is not set
 # CONFIG_JFS_STATISTICS is not set
-# CONFIG_XFS_FS is not set
+CONFIG_XFS_FS=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_ONLINE_SCRUB is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=y

config/kernel/linux-udoo-next.config

@@ -4050,7 +4050,10 @@ CONFIG_JFS_POSIX_ACL=y
 CONFIG_JFS_SECURITY=y
 # CONFIG_JFS_DEBUG is not set
 # CONFIG_JFS_STATISTICS is not set
-# CONFIG_XFS_FS is not set
+CONFIG_XFS_FS=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
 CONFIG_GFS2_FS=m
 CONFIG_OCFS2_FS=m
 CONFIG_OCFS2_FS_O2CB=m

lib/makeboarddeb.sh

@@ -214,17 +214,7 @@ create_board_package()
 			echo "Updating bootscript"
 
 			# copy new bootscript
-			cp /usr/share/armbian/$bootscript_dst /boot  >/dev/null 2>&1
-
-			# build new bootscript
-			if [ -f /boot/boot.cmd ]; then
-				mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr  >/dev/null 2>&1
-			elif [ -f /boot/boot.ini ]; then
-				rootdev=\$(sed -e 's/^.*root=//' -e 's/ .*\$//' < /proc/cmdline)
-				rootfstype=\$(sed -e 's/^.*rootfstype=//' -e 's/ .*$//' < /proc/cmdline)
-				sed -i "s/setenv rootfstype.*/setenv rootfstype \\"\$rootfstype\\"/" /boot/boot.ini
-				sed -i "s/setenv rootdev.*/setenv rootdev \\"\$rootdev\\"/" /boot/boot.ini
-			fi
+			cp -f /usr/share/armbian/$bootscript_dst /boot/${bootscript_dst}.new  >/dev/null 2>&1
 
 			# cleanup old bootscript backup
 			[ -f /usr/share/armbian/boot.cmd ] && ls /usr/share/armbian/boot.cmd-* | head -n -5 | xargs rm -f --

packages/bsp/common/usr/lib/armbian/armbian-ramlog

@@ -46,7 +46,7 @@ syncToDisk () {
 	echo -e "\n\n$(date): Syncing logs from $LOG_TYPE to storage\n" | $LOG_OUTPUT
 
 	if [ "$USE_RSYNC" = true ]; then
-		${NoCache} rsync -aXWv --exclude armbian-ramlog.log --links $RAM_LOG $HDD_LOG 2>&1 | $LOG_OUTPUT
+		${NoCache} rsync -aXWv --delete --exclude armbian-ramlog.log --links $RAM_LOG $HDD_LOG 2>&1 | $LOG_OUTPUT
 	else
 		${NoCache} cp -rfup $RAM_LOG -T $HDD_LOG 2>&1 | $LOG_OUTPUT
 	fi

packages/bsp/common/usr/sbin/nand-sata-install

@@ -521,6 +521,21 @@ check_nvme_target()
 	DISK_ROOT_PART=${NVMeOptions[(2*$NVMeChoices)-1]}
 }
 
+# build and update new bootscript
+update_bootscript()
+{
+	if [ -f /boot/boot.cmd.new ]; then
+		mv -f /boot/boot.cmd.new /boot/boot.cmd >/dev/null 2>&1
+		mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr  >/dev/null 2>&1
+	elif [ -f /boot/boot.ini.new ]; then
+		mv -f /boot/boot.ini.new /boot/boot.ini >/dev/null 2>&1
+		rootdev=$(sed -e 's/^.*root=//' -e 's/ .*$//' < /proc/cmdline)
+		rootfstype=$(sed -e 's/^.*rootfstype=//' -e 's/ .*$//' < /proc/cmdline)
+		sed -i "s/setenv rootfstype.*/setenv rootfstype \"$rootfstype\"/" /boot/boot.ini
+		sed -i "s/setenv rootdev.*/setenv rootdev \"$rootdev\"/" /boot/boot.ini
+	fi
+}
+
 # show warning [TEXT]
 show_warning()
 {
@@ -646,6 +661,7 @@ main()
 			5)
 				show_warning "This script will update the bootloader on SD/eMMC. Continue?"
 				write_uboot_platform $DIR ${root_partition_device}
+				update_bootscript
 				dialog --backtitle "$backtitle" --title "Writing bootloader" --msgbox "\n          Done." 7 30
 				return
 				;;
@@ -664,6 +680,7 @@ main()
 				MTD_BLK="/dev/${spicheck}"
 				show_warning "This script will update the bootloader on SPI Flash $MTD_BLK. Continue?"
 				write_uboot_platform_mtd $DIR $MTD_BLK
+				update_bootscript
 				echo "Done"
 				return
 				;;

packages/extras-buildpkgs/90-hostapd.conf

@@ -1,8 +1,8 @@
 # hostapd
 local package_name="hostapd"
 local package_repo="http://w1.fi/hostap.git"
-local package_ref="tag:hostap_2_6"
-local package_upstream_version="3:2.6-99"
+local package_ref="tag:hostap_2_7"
+local package_upstream_version="3:2.7-99"
 local package_builddeps="pkg-config libssl-dev libreadline-dev libpcsclite-dev libnl-route-3-dev libnl-genl-3-dev libnl-3-dev libncurses5-dev libdbus-1-dev docbook-utils docbook-to-man"
 local package_install_target="hostapd"
 local package_component="${release}-utils"

packages/extras-buildpkgs/hostapd/debian/patches/0002-Check-for-NULL-qsort-base-pointers.patch

@@ -1,51 +0,0 @@
-From 33111c910bf8c138f3be1cef99b318e26fb28a04 Mon Sep 17 00:00:00 2001
-From: Joel Cunningham <joel.cunningham@me.com>
-Date: Sat, 8 Oct 2016 12:04:15 -0500
-Subject: [PATCH] Check for NULL qsort() base pointers
-
-There are a couple of places in wpa_supplicant/hostapd where qsort() can
-be called with a NULL base pointer. This results in undefined behavior
-according to the C standard and with some standard C libraries (ARM RVCT
-2.2) results in a data abort/memory exception. Fix this by skipping such
-calls since there is nothing needing to be sorted.
-
-Signed-off-by: Joel Cunningham <joel.cunningham@me.com>
----
- hostapd/config_file.c | 3 ++-
- wpa_supplicant/scan.c | 6 ++++--
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/hostapd/config_file.c b/hostapd/config_file.c
-index 9c744de..8e7bcc7 100644
---- a/hostapd/config_file.c
-+++ b/hostapd/config_file.c
-@@ -208,7 +208,8 @@ static int hostapd_config_read_maclist(const char *fname,
- 
- 	fclose(f);
- 
--	qsort(*acl, *num, sizeof(**acl), hostapd_acl_comp);
-+	if (*acl)
-+		qsort(*acl, *num, sizeof(**acl), hostapd_acl_comp);
- 
- 	return 0;
- }
-diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
-index fb8ebdf..bfde0af 100644
---- a/wpa_supplicant/scan.c
-+++ b/wpa_supplicant/scan.c
-@@ -2177,8 +2177,10 @@ wpa_supplicant_get_scan_results(struct wpa_supplicant *wpa_s,
- 	}
- #endif /* CONFIG_WPS */
- 
--	qsort(scan_res->res, scan_res->num, sizeof(struct wpa_scan_res *),
--	      compar);
-+	if (scan_res->res) {
-+		qsort(scan_res->res, scan_res->num,
-+		      sizeof(struct wpa_scan_res *), compar);
-+	}
- 	dump_scan_res(scan_res);
- 
- 	wpa_bss_update_start(wpa_s);
--- 
-2.9.3
-

packages/extras-buildpkgs/hostapd/debian/patches/0005-nl80211-Update-channel-information-after-channel-swi.patch

@@ -1,34 +0,0 @@
-From c2ad5b9218f33d6f4b97d779c4928d71d82ad02c Mon Sep 17 00:00:00 2001
-From: Peng Xu <pxu@qca.qualcomm.com>
-Date: Mon, 24 Oct 2016 16:54:36 -0700
-Subject: [PATCH] nl80211: Update channel information after channel switch
- notification
-
-When channel switch happens, driver wrapper's internal channel
-information needs to be updated so that the new frequency will be used
-in operations using drv->assoc_freq. Previously, only bss->freq was
-updated and the new frequency was also indicated in the EVENT_CH_SWITCH
-event. This could potentially leave out couple of cases that use
-drv->assoc_freq at least as a fallback mechanism for getting the current
-operating frequency.
-
-Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
----
- src/drivers/driver_nl80211_event.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/drivers/driver_nl80211_event.c b/src/drivers/driver_nl80211_event.c
-index dc7d5f1..c77e21e 100644
---- a/src/drivers/driver_nl80211_event.c
-+++ b/src/drivers/driver_nl80211_event.c
-@@ -518,6 +518,7 @@ static void mlme_event_ch_switch(struct wpa_driver_nl80211_data *drv,
- 		data.ch_switch.cf2 = nla_get_u32(cf2);
- 
- 	bss->freq = data.ch_switch.freq;
-+	drv->assoc_freq = data.ch_switch.freq;
- 
- 	wpa_supplicant_event(bss->ctx, EVENT_CH_SWITCH, &data);
- }
--- 
-2.9.3
-

packages/extras-buildpkgs/hostapd/debian/patches/2017-1/0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch

@@ -1,108 +0,0 @@
-From c153b271f9f6446f52dae708f89f5b9a81fd9903 Mon Sep 17 00:00:00 2001
-From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
-Date: Fri, 14 Jul 2017 15:15:35 +0200
-Subject: [PATCH 01/12] hostapd: Avoid key reinstallation in FT handshake
-
-Do not reinstall TK to the driver during Reassociation Response frame
-processing if the first attempt of setting the TK succeeded. This avoids
-issues related to clearing the TX/RX PN that could result in reusing
-same PN values for transmitted frames (e.g., due to CCM nonce reuse and
-also hitting replay protection on the receiver) and accepting replayed
-frames on RX side.
-
-This issue was introduced by the commit
-0e84c25434e6a1f283c7b4e62e483729085b78d2 ('FT: Fix PTK configuration in
-authenticator') which allowed wpa_ft_install_ptk() to be called multiple
-times with the same PTK. While the second configuration attempt is
-needed with some drivers, it must be done only if the first attempt
-failed.
-
-Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
----
- src/ap/wpa_auth.c    |  8 ++++++++
- src/ap/wpa_auth.h    |  1 +
- src/ap/wpa_auth_ft.c | 10 ++++++++++
- src/ap/wpa_auth_i.h  |  1 +
- 4 files changed, 20 insertions(+)
-
-diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c
-index 9c5f609..1b3390a 100644
---- a/src/ap/wpa_auth.c
-+++ b/src/ap/wpa_auth.c
-@@ -3169,6 +3169,14 @@ int wpa_auth_sta_wpa_version(struct wpa_state_machine *sm)
- }
- 
- 
-+int wpa_auth_sta_ft_tk_already_set(struct wpa_state_machine *sm)
-+{
-+	if (!sm || !wpa_key_mgmt_ft(sm->wpa_key_mgmt))
-+		return 0;
-+	return sm->tk_already_set;
-+}
-+
-+
- int wpa_auth_sta_clear_pmksa(struct wpa_state_machine *sm,
- 			     struct rsn_pmksa_cache_entry *entry)
- {
-diff --git a/src/ap/wpa_auth.h b/src/ap/wpa_auth.h
-index 2788e65..1aeee40 100644
---- a/src/ap/wpa_auth.h
-+++ b/src/ap/wpa_auth.h
-@@ -266,6 +266,7 @@ int wpa_auth_pairwise_set(struct wpa_state_machine *sm);
- int wpa_auth_get_pairwise(struct wpa_state_machine *sm);
- int wpa_auth_sta_key_mgmt(struct wpa_state_machine *sm);
- int wpa_auth_sta_wpa_version(struct wpa_state_machine *sm);
-+int wpa_auth_sta_ft_tk_already_set(struct wpa_state_machine *sm);
- int wpa_auth_sta_clear_pmksa(struct wpa_state_machine *sm,
- 			     struct rsn_pmksa_cache_entry *entry);
- struct rsn_pmksa_cache_entry *
-diff --git a/src/ap/wpa_auth_ft.c b/src/ap/wpa_auth_ft.c
-index ef3249a..17e6039 100644
---- a/src/ap/wpa_auth_ft.c
-+++ b/src/ap/wpa_auth_ft.c
-@@ -779,6 +779,14 @@ void wpa_ft_install_ptk(struct wpa_state_machine *sm)
- 		return;
- 	}
- 
-+	if (sm->tk_already_set) {
-+		/* Must avoid TK reconfiguration to prevent clearing of TX/RX
-+		 * PN in the driver */
-+		wpa_printf(MSG_DEBUG,
-+			   "FT: Do not re-install same PTK to the driver");
-+		return;
-+	}
-+
- 	/* FIX: add STA entry to kernel/driver here? The set_key will fail
- 	 * most likely without this.. At the moment, STA entry is added only
- 	 * after association has been completed. This function will be called
-@@ -791,6 +799,7 @@ void wpa_ft_install_ptk(struct wpa_state_machine *sm)
- 
- 	/* FIX: MLME-SetProtection.Request(TA, Tx_Rx) */
- 	sm->pairwise_set = TRUE;
-+	sm->tk_already_set = TRUE;
- }
- 
- 
-@@ -897,6 +906,7 @@ static int wpa_ft_process_auth_req(struct wpa_state_machine *sm,
- 
- 	sm->pairwise = pairwise;
- 	sm->PTK_valid = TRUE;
-+	sm->tk_already_set = FALSE;
- 	wpa_ft_install_ptk(sm);
- 
- 	buflen = 2 + sizeof(struct rsn_mdie) + 2 + sizeof(struct rsn_ftie) +
-diff --git a/src/ap/wpa_auth_i.h b/src/ap/wpa_auth_i.h
-index 7b2cd3e..0f3d504 100644
---- a/src/ap/wpa_auth_i.h
-+++ b/src/ap/wpa_auth_i.h
-@@ -64,6 +64,7 @@ struct wpa_state_machine {
- 	struct wpa_ptk PTK;
- 	Boolean PTK_valid;
- 	Boolean pairwise_set;
-+	Boolean tk_already_set;
- 	int keycount;
- 	Boolean Pair;
- 	struct wpa_key_replay_counter {
--- 
-2.7.4
-

packages/extras-buildpkgs/hostapd/debian/patches/2017-1/0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch

@@ -1,250 +0,0 @@
-From 3ca4a8aecd27d01f4ad880cda2678bc63034898f Mon Sep 17 00:00:00 2001
-From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
-Date: Wed, 12 Jul 2017 16:03:24 +0200
-Subject: [PATCH 02/12] Prevent reinstallation of an already in-use group key
-
-Track the current GTK and IGTK that is in use and when receiving a
-(possibly retransmitted) Group Message 1 or WNM-Sleep Mode Response, do
-not install the given key if it is already in use. This prevents an
-attacker from trying to trick the client into resetting or lowering the
-sequence counter associated to the group key.
-
-Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
----
- src/common/wpa_common.h |  11 +++++
- src/rsn_supp/wpa.c      | 116 ++++++++++++++++++++++++++++++------------------
- src/rsn_supp/wpa_i.h    |   4 ++
- 3 files changed, 87 insertions(+), 44 deletions(-)
-
-diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h
-index 091e317..66f9977 100644
---- a/src/common/wpa_common.h
-+++ b/src/common/wpa_common.h
-@@ -224,6 +224,17 @@ struct wpa_ptk {
- 	size_t tk_len;
- };
- 
-+struct wpa_gtk {
-+	u8 gtk[WPA_GTK_MAX_LEN];
-+	size_t gtk_len;
-+};
-+
-+#ifdef CONFIG_IEEE80211W
-+struct wpa_igtk {
-+	u8 igtk[WPA_IGTK_MAX_LEN];
-+	size_t igtk_len;
-+};
-+#endif /* CONFIG_IEEE80211W */
- 
- /* WPA IE version 1
-  * 00-50-f2:1 (OUI:OUI type)
-diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
-index 8adeef4..fba610e 100644
---- a/src/rsn_supp/wpa.c
-+++ b/src/rsn_supp/wpa.c
-@@ -686,6 +686,15 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm,
- 	const u8 *_gtk = gd->gtk;
- 	u8 gtk_buf[32];
- 
-+	/* Detect possible key reinstallation */
-+	if (sm->gtk.gtk_len == (size_t) gd->gtk_len &&
-+	    os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) {
-+		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
-+			"WPA: Not reinstalling already in-use GTK to the driver (keyidx=%d tx=%d len=%d)",
-+			gd->keyidx, gd->tx, gd->gtk_len);
-+		return 0;
-+	}
-+
- 	wpa_hexdump_key(MSG_DEBUG, "WPA: Group Key", gd->gtk, gd->gtk_len);
- 	wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
- 		"WPA: Installing GTK to the driver (keyidx=%d tx=%d len=%d)",
-@@ -720,6 +729,9 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm,
- 	}
- 	os_memset(gtk_buf, 0, sizeof(gtk_buf));
- 
-+	sm->gtk.gtk_len = gd->gtk_len;
-+	os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len);
-+
- 	return 0;
- }
- 
-@@ -791,6 +803,48 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm,
- }
- 
- 
-+#ifdef CONFIG_IEEE80211W
-+static int wpa_supplicant_install_igtk(struct wpa_sm *sm,
-+				       const struct wpa_igtk_kde *igtk)
-+{
-+	size_t len = wpa_cipher_key_len(sm->mgmt_group_cipher);
-+	u16 keyidx = WPA_GET_LE16(igtk->keyid);
-+
-+	/* Detect possible key reinstallation */
-+	if (sm->igtk.igtk_len == len &&
-+	    os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) {
-+		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
-+			"WPA: Not reinstalling already in-use IGTK to the driver (keyidx=%d)",
-+			keyidx);
-+		return  0;
-+	}
-+
-+	wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
-+		"WPA: IGTK keyid %d pn %02x%02x%02x%02x%02x%02x",
-+		keyidx, MAC2STR(igtk->pn));
-+	wpa_hexdump_key(MSG_DEBUG, "WPA: IGTK", igtk->igtk, len);
-+	if (keyidx > 4095) {
-+		wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
-+			"WPA: Invalid IGTK KeyID %d", keyidx);
-+		return -1;
-+	}
-+	if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher),
-+			   broadcast_ether_addr,
-+			   keyidx, 0, igtk->pn, sizeof(igtk->pn),
-+			   igtk->igtk, len) < 0) {
-+		wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
-+			"WPA: Failed to configure IGTK to the driver");
-+		return -1;
-+	}
-+
-+	sm->igtk.igtk_len = len;
-+	os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len);
-+
-+	return 0;
-+}
-+#endif /* CONFIG_IEEE80211W */
-+
-+
- static int ieee80211w_set_keys(struct wpa_sm *sm,
- 			       struct wpa_eapol_ie_parse *ie)
- {
-@@ -801,30 +855,14 @@ static int ieee80211w_set_keys(struct wpa_sm *sm,
- 	if (ie->igtk) {
- 		size_t len;
- 		const struct wpa_igtk_kde *igtk;
--		u16 keyidx;
-+
- 		len = wpa_cipher_key_len(sm->mgmt_group_cipher);
- 		if (ie->igtk_len != WPA_IGTK_KDE_PREFIX_LEN + len)
- 			return -1;
-+
- 		igtk = (const struct wpa_igtk_kde *) ie->igtk;
--		keyidx = WPA_GET_LE16(igtk->keyid);
--		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, "WPA: IGTK keyid %d "
--			"pn %02x%02x%02x%02x%02x%02x",
--			keyidx, MAC2STR(igtk->pn));
--		wpa_hexdump_key(MSG_DEBUG, "WPA: IGTK",
--				igtk->igtk, len);
--		if (keyidx > 4095) {
--			wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
--				"WPA: Invalid IGTK KeyID %d", keyidx);
--			return -1;
--		}
--		if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher),
--				   broadcast_ether_addr,
--				   keyidx, 0, igtk->pn, sizeof(igtk->pn),
--				   igtk->igtk, len) < 0) {
--			wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
--				"WPA: Failed to configure IGTK to the driver");
-+		if (wpa_supplicant_install_igtk(sm, igtk) < 0)
- 			return -1;
--		}
- 	}
- 
- 	return 0;
-@@ -2228,7 +2266,7 @@ void wpa_sm_deinit(struct wpa_sm *sm)
-  */
- void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid)
- {
--	int clear_ptk = 1;
-+	int clear_keys = 1;
- 
- 	if (sm == NULL)
- 		return;
-@@ -2254,11 +2292,11 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid)
- 		/* Prepare for the next transition */
- 		wpa_ft_prepare_auth_request(sm, NULL);
- 
--		clear_ptk = 0;
-+		clear_keys = 0;
- 	}
- #endif /* CONFIG_IEEE80211R */
- 
--	if (clear_ptk) {
-+	if (clear_keys) {
- 		/*
- 		 * IEEE 802.11, 8.4.10: Delete PTK SA on (re)association if
- 		 * this is not part of a Fast BSS Transition.
-@@ -2268,6 +2306,10 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid)
- 		os_memset(&sm->ptk, 0, sizeof(sm->ptk));
- 		sm->tptk_set = 0;
- 		os_memset(&sm->tptk, 0, sizeof(sm->tptk));
-+		os_memset(&sm->gtk, 0, sizeof(sm->gtk));
-+#ifdef CONFIG_IEEE80211W
-+		os_memset(&sm->igtk, 0, sizeof(sm->igtk));
-+#endif /* CONFIG_IEEE80211W */
- 	}
- 
- #ifdef CONFIG_TDLS
-@@ -2784,6 +2826,10 @@ void wpa_sm_drop_sa(struct wpa_sm *sm)
- 	os_memset(sm->pmk, 0, sizeof(sm->pmk));
- 	os_memset(&sm->ptk, 0, sizeof(sm->ptk));
- 	os_memset(&sm->tptk, 0, sizeof(sm->tptk));
-+	os_memset(&sm->gtk, 0, sizeof(sm->gtk));
-+#ifdef CONFIG_IEEE80211W
-+	os_memset(&sm->igtk, 0, sizeof(sm->igtk));
-+#endif /* CONFIG_IEEE80211W */
- #ifdef CONFIG_IEEE80211R
- 	os_memset(sm->xxkey, 0, sizeof(sm->xxkey));
- 	os_memset(sm->pmk_r0, 0, sizeof(sm->pmk_r0));
-@@ -2856,29 +2902,11 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf)
- 		os_memset(&gd, 0, sizeof(gd));
- #ifdef CONFIG_IEEE80211W
- 	} else if (subelem_id == WNM_SLEEP_SUBELEM_IGTK) {
--		struct wpa_igtk_kde igd;
--		u16 keyidx;
--
--		os_memset(&igd, 0, sizeof(igd));
--		keylen = wpa_cipher_key_len(sm->mgmt_group_cipher);
--		os_memcpy(igd.keyid, buf + 2, 2);
--		os_memcpy(igd.pn, buf + 4, 6);
--
--		keyidx = WPA_GET_LE16(igd.keyid);
--		os_memcpy(igd.igtk, buf + 10, keylen);
--
--		wpa_hexdump_key(MSG_DEBUG, "Install IGTK (WNM SLEEP)",
--				igd.igtk, keylen);
--		if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher),
--				   broadcast_ether_addr,
--				   keyidx, 0, igd.pn, sizeof(igd.pn),
--				   igd.igtk, keylen) < 0) {
--			wpa_printf(MSG_DEBUG, "Failed to install the IGTK in "
--				   "WNM mode");
--			os_memset(&igd, 0, sizeof(igd));
-+		const struct wpa_igtk_kde *igtk;
-+
-+		igtk = (const struct wpa_igtk_kde *) (buf + 2);
-+		if (wpa_supplicant_install_igtk(sm, igtk) < 0)
- 			return -1;
--		}
--		os_memset(&igd, 0, sizeof(igd));
- #endif /* CONFIG_IEEE80211W */
- 	} else {
- 		wpa_printf(MSG_DEBUG, "Unknown element id");
-diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h
-index 965a9c1..27b6123 100644
---- a/src/rsn_supp/wpa_i.h
-+++ b/src/rsn_supp/wpa_i.h
-@@ -30,6 +30,10 @@ struct wpa_sm {
- 	u8 rx_replay_counter[WPA_REPLAY_COUNTER_LEN];
- 	int rx_replay_counter_set;
- 	u8 request_counter[WPA_REPLAY_COUNTER_LEN];
-+	struct wpa_gtk gtk;
-+#ifdef CONFIG_IEEE80211W
-+	struct wpa_igtk igtk;
-+#endif /* CONFIG_IEEE80211W */
- 
- 	struct eapol_sm *eapol; /* EAPOL state machine from upper level code */
- 
--- 
-2.7.4
-

packages/extras-buildpkgs/hostapd/debian/patches/2017-1/0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch

@@ -1,182 +0,0 @@
-From 87e2db16bafcbc60b8d0016175814a73c1e8ed45 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Sun, 1 Oct 2017 12:12:24 +0300
-Subject: Extend protection of GTK/IGTK reinstallation of WNM-Sleep Mode cases
-
-This extends the protection to track last configured GTK/IGTK value
-separately from EAPOL-Key frames and WNM-Sleep Mode frames to cover a
-corner case where these two different mechanisms may get used when the
-GTK/IGTK has changed and tracking a single value is not sufficient to
-detect a possible key reconfiguration.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
- src/rsn_supp/wpa.c   | 55 +++++++++++++++++++++++++++++++++++++---------------
- src/rsn_supp/wpa_i.h |  2 ++
- 2 files changed, 41 insertions(+), 16 deletions(-)
-
-diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
-index 22e8661..acdac17 100644
---- a/src/rsn_supp/wpa.c
-+++ b/src/rsn_supp/wpa.c
-@@ -797,14 +797,17 @@ struct wpa_gtk_data {
- 
- static int wpa_supplicant_install_gtk(struct wpa_sm *sm,
- 				      const struct wpa_gtk_data *gd,
--				      const u8 *key_rsc)
-+				      const u8 *key_rsc, int wnm_sleep)
- {
- 	const u8 *_gtk = gd->gtk;
- 	u8 gtk_buf[32];
- 
- 	/* Detect possible key reinstallation */
--	if (sm->gtk.gtk_len == (size_t) gd->gtk_len &&
--	    os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) {
-+	if ((sm->gtk.gtk_len == (size_t) gd->gtk_len &&
-+	     os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) ||
-+	    (sm->gtk_wnm_sleep.gtk_len == (size_t) gd->gtk_len &&
-+	     os_memcmp(sm->gtk_wnm_sleep.gtk, gd->gtk,
-+		       sm->gtk_wnm_sleep.gtk_len) == 0)) {
- 		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
- 			"WPA: Not reinstalling already in-use GTK to the driver (keyidx=%d tx=%d len=%d)",
- 			gd->keyidx, gd->tx, gd->gtk_len);
-@@ -845,8 +848,14 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm,
- 	}
- 	os_memset(gtk_buf, 0, sizeof(gtk_buf));
- 
--	sm->gtk.gtk_len = gd->gtk_len;
--	os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len);
-+	if (wnm_sleep) {
-+		sm->gtk_wnm_sleep.gtk_len = gd->gtk_len;
-+		os_memcpy(sm->gtk_wnm_sleep.gtk, gd->gtk,
-+			  sm->gtk_wnm_sleep.gtk_len);
-+	} else {
-+		sm->gtk.gtk_len = gd->gtk_len;
-+		os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len);
-+	}
- 
- 	return 0;
- }
-@@ -940,7 +949,7 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm,
- 	    (wpa_supplicant_check_group_cipher(sm, sm->group_cipher,
- 					       gtk_len, gtk_len,
- 					       &gd.key_rsc_len, &gd.alg) ||
--	     wpa_supplicant_install_gtk(sm, &gd, key_rsc))) {
-+	     wpa_supplicant_install_gtk(sm, &gd, key_rsc, 0))) {
- 		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
- 			"RSN: Failed to install GTK");
- 		os_memset(&gd, 0, sizeof(gd));
-@@ -956,14 +965,18 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm,
- 
- #ifdef CONFIG_IEEE80211W
- static int wpa_supplicant_install_igtk(struct wpa_sm *sm,
--				       const struct wpa_igtk_kde *igtk)
-+				       const struct wpa_igtk_kde *igtk,
-+				       int wnm_sleep)
- {
- 	size_t len = wpa_cipher_key_len(sm->mgmt_group_cipher);
- 	u16 keyidx = WPA_GET_LE16(igtk->keyid);
- 
- 	/* Detect possible key reinstallation */
--	if (sm->igtk.igtk_len == len &&
--	    os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) {
-+	if ((sm->igtk.igtk_len == len &&
-+	     os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) ||
-+	    (sm->igtk_wnm_sleep.igtk_len == len &&
-+	     os_memcmp(sm->igtk_wnm_sleep.igtk, igtk->igtk,
-+		       sm->igtk_wnm_sleep.igtk_len) == 0)) {
- 		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
- 			"WPA: Not reinstalling already in-use IGTK to the driver (keyidx=%d)",
- 			keyidx);
-@@ -988,8 +1001,14 @@ static int wpa_supplicant_install_igtk(struct wpa_sm *sm,
- 		return -1;
- 	}
- 
--	sm->igtk.igtk_len = len;
--	os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len);
-+	if (wnm_sleep) {
-+		sm->igtk_wnm_sleep.igtk_len = len;
-+		os_memcpy(sm->igtk_wnm_sleep.igtk, igtk->igtk,
-+			  sm->igtk_wnm_sleep.igtk_len);
-+	} else {
-+		sm->igtk.igtk_len = len;
-+		os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len);
-+	}
- 
- 	return 0;
- }
-@@ -1012,7 +1031,7 @@ static int ieee80211w_set_keys(struct wpa_sm *sm,
- 			return -1;
- 
- 		igtk = (const struct wpa_igtk_kde *) ie->igtk;
--		if (wpa_supplicant_install_igtk(sm, igtk) < 0)
-+		if (wpa_supplicant_install_igtk(sm, igtk, 0) < 0)
- 			return -1;
- 	}
- 
-@@ -1661,7 +1680,7 @@ static void wpa_supplicant_process_1_of_2(struct wpa_sm *sm,
- 	if (wpa_supplicant_rsc_relaxation(sm, key->key_rsc))
- 		key_rsc = null_rsc;
- 
--	if (wpa_supplicant_install_gtk(sm, &gd, key_rsc) ||
-+	if (wpa_supplicant_install_gtk(sm, &gd, key_rsc, 0) ||
- 	    wpa_supplicant_send_2_of_2(sm, key, ver, key_info) < 0)
- 		goto failed;
- 	os_memset(&gd, 0, sizeof(gd));
-@@ -2582,8 +2601,10 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid)
- 		sm->tptk_set = 0;
- 		os_memset(&sm->tptk, 0, sizeof(sm->tptk));
- 		os_memset(&sm->gtk, 0, sizeof(sm->gtk));
-+		os_memset(&sm->gtk_wnm_sleep, 0, sizeof(sm->gtk_wnm_sleep));
- #ifdef CONFIG_IEEE80211W
- 		os_memset(&sm->igtk, 0, sizeof(sm->igtk));
-+		os_memset(&sm->igtk_wnm_sleep, 0, sizeof(sm->igtk_wnm_sleep));
- #endif /* CONFIG_IEEE80211W */
- 	}
- 
-@@ -3162,8 +3183,10 @@ void wpa_sm_drop_sa(struct wpa_sm *sm)
- 	os_memset(&sm->ptk, 0, sizeof(sm->ptk));
- 	os_memset(&sm->tptk, 0, sizeof(sm->tptk));
- 	os_memset(&sm->gtk, 0, sizeof(sm->gtk));
-+	os_memset(&sm->gtk_wnm_sleep, 0, sizeof(sm->gtk_wnm_sleep));
- #ifdef CONFIG_IEEE80211W
- 	os_memset(&sm->igtk, 0, sizeof(sm->igtk));
-+	os_memset(&sm->igtk_wnm_sleep, 0, sizeof(sm->igtk_wnm_sleep));
- #endif /* CONFIG_IEEE80211W */
- #ifdef CONFIG_IEEE80211R
- 	os_memset(sm->xxkey, 0, sizeof(sm->xxkey));
-@@ -3228,7 +3251,7 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf)
- 
- 		wpa_hexdump_key(MSG_DEBUG, "Install GTK (WNM SLEEP)",
- 				gd.gtk, gd.gtk_len);
--		if (wpa_supplicant_install_gtk(sm, &gd, key_rsc)) {
-+		if (wpa_supplicant_install_gtk(sm, &gd, key_rsc, 1)) {
- 			os_memset(&gd, 0, sizeof(gd));
- 			wpa_printf(MSG_DEBUG, "Failed to install the GTK in "
- 				   "WNM mode");
-@@ -3240,7 +3263,7 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf)
- 		const struct wpa_igtk_kde *igtk;
- 
- 		igtk = (const struct wpa_igtk_kde *) (buf + 2);
--		if (wpa_supplicant_install_igtk(sm, igtk) < 0)
-+		if (wpa_supplicant_install_igtk(sm, igtk, 1) < 0)
- 			return -1;
- #endif /* CONFIG_IEEE80211W */
- 	} else {
-diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h
-index 89e1d34..5331146 100644
---- a/src/rsn_supp/wpa_i.h
-+++ b/src/rsn_supp/wpa_i.h
-@@ -32,8 +32,10 @@ struct wpa_sm {
- 	int rx_replay_counter_set;
- 	u8 request_counter[WPA_REPLAY_COUNTER_LEN];
- 	struct wpa_gtk gtk;
-+	struct wpa_gtk gtk_wnm_sleep;
- #ifdef CONFIG_IEEE80211W
- 	struct wpa_igtk igtk;
-+	struct wpa_igtk igtk_wnm_sleep;
- #endif /* CONFIG_IEEE80211W */
- 
- 	struct eapol_sm *eapol; /* EAPOL state machine from upper level code */
--- 
-cgit v0.12

packages/extras-buildpkgs/hostapd/debian/patches/2017-1/0005-Prevent-installation-of-an-all-zero-TK.patch

@@ -1,79 +0,0 @@
-From 5c2c0c4d31a95e2d557df51074a2ab9732a98d4f Mon Sep 17 00:00:00 2001
-From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
-Date: Fri, 29 Sep 2017 04:22:51 +0200
-Subject: [PATCH 05/12] Prevent installation of an all-zero TK
-
-Properly track whether a PTK has already been installed to the driver
-and the TK part cleared from memory. This prevents an attacker from
-trying to trick the client into installing an all-zero TK.
-
-This fixes the earlier fix in commit
-ad00d64e7d8827b3cebd665a0ceb08adabf15e1e ('Fix TK configuration to the
-driver in EAPOL-Key 3/4 retry case') which did not take into account
-possibility of an extra message 1/4 showing up between retries of
-message 3/4.
-
-Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
----
- src/common/wpa_common.h | 1 +
- src/rsn_supp/wpa.c      | 5 ++---
- src/rsn_supp/wpa_i.h    | 1 -
- 3 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h
-index 66f9977..5632d37 100644
---- a/src/common/wpa_common.h
-+++ b/src/common/wpa_common.h
-@@ -222,6 +222,7 @@ struct wpa_ptk {
- 	size_t kck_len;
- 	size_t kek_len;
- 	size_t tk_len;
-+	int installed; /* 1 if key has already been installed to driver */
- };
- 
- struct wpa_gtk {
-diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
-index e199fe7..8e28064 100644
---- a/src/rsn_supp/wpa.c
-+++ b/src/rsn_supp/wpa.c
-@@ -489,7 +489,6 @@ static void wpa_supplicant_process_1_of_4(struct wpa_sm *sm,
- 		os_memset(buf, 0, sizeof(buf));
- 	}
- 	sm->tptk_set = 1;
--	sm->tk_to_set = 1;
- 
- 	kde = sm->assoc_wpa_ie;
- 	kde_len = sm->assoc_wpa_ie_len;
-@@ -595,7 +594,7 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm,
- 	enum wpa_alg alg;
- 	const u8 *key_rsc;
- 
--	if (!sm->tk_to_set) {
-+	if (sm->ptk.installed) {
- 		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
- 			"WPA: Do not re-install same PTK to the driver");
- 		return 0;
-@@ -639,7 +638,7 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm,
- 
- 	/* TK is not needed anymore in supplicant */
- 	os_memset(sm->ptk.tk, 0, WPA_TK_MAX_LEN);
--	sm->tk_to_set = 0;
-+	sm->ptk.installed = 1;
- 
- 	if (sm->wpa_ptk_rekey) {
- 		eloop_cancel_timeout(wpa_sm_rekey_ptk, sm, NULL);
-diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h
-index 5ba0692..51753ee 100644
---- a/src/rsn_supp/wpa_i.h
-+++ b/src/rsn_supp/wpa_i.h
-@@ -24,7 +24,6 @@ struct wpa_sm {
- 	struct wpa_ptk ptk, tptk;
- 	int ptk_set, tptk_set;
- 	unsigned int msg_3_of_4_ok:1;
--	unsigned int tk_to_set:1;
- 	u8 snonce[WPA_NONCE_LEN];
- 	u8 anonce[WPA_NONCE_LEN]; /* ANonce from the last 1/4 msg */
- 	int renew_snonce;
--- 
-2.7.4
-

packages/extras-buildpkgs/hostapd/debian/patches/2017-1/0006-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch

@@ -1,64 +0,0 @@
-From 042e6221680909668f2af7e3be56ae0ff8b03c72 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Sun, 1 Oct 2017 12:32:57 +0300
-Subject: [PATCH 06/12] Fix PTK rekeying to generate a new ANonce
-
-The Authenticator state machine path for PTK rekeying ended up bypassing
-the AUTHENTICATION2 state where a new ANonce is generated when going
-directly to the PTKSTART state since there is no need to try to
-determine the PMK again in such a case. This is far from ideal since the
-new PTK would depend on a new nonce only from the supplicant.
-
-Fix this by generating a new ANonce when moving to the PTKSTART state
-for the purpose of starting new 4-way handshake to rekey PTK.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
- src/ap/wpa_auth.c | 24 +++++++++++++++++++++---
- 1 file changed, 21 insertions(+), 3 deletions(-)
-
-diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c
-index 1b3390a..b9f3fb1 100644
---- a/src/ap/wpa_auth.c
-+++ b/src/ap/wpa_auth.c
-@@ -1856,6 +1856,21 @@ SM_STATE(WPA_PTK, AUTHENTICATION2)
- }
- 
- 
-+static int wpa_auth_sm_ptk_update(struct wpa_state_machine *sm)
-+{
-+	if (random_get_bytes(sm->ANonce, WPA_NONCE_LEN)) {
-+		wpa_printf(MSG_ERROR,
-+			   "WPA: Failed to get random data for ANonce");
-+		sm->Disconnect = TRUE;
-+		return -1;
-+	}
-+	wpa_hexdump(MSG_DEBUG, "WPA: Assign new ANonce", sm->ANonce,
-+		    WPA_NONCE_LEN);
-+	sm->TimeoutCtr = 0;
-+	return 0;
-+}
-+
-+
- SM_STATE(WPA_PTK, INITPMK)
- {
- 	u8 msk[2 * PMK_LEN];
-@@ -2374,9 +2389,12 @@ SM_STEP(WPA_PTK)
- 		SM_ENTER(WPA_PTK, AUTHENTICATION);
- 	else if (sm->ReAuthenticationRequest)
- 		SM_ENTER(WPA_PTK, AUTHENTICATION2);
--	else if (sm->PTKRequest)
--		SM_ENTER(WPA_PTK, PTKSTART);
--	else switch (sm->wpa_ptk_state) {
-+	else if (sm->PTKRequest) {
-+		if (wpa_auth_sm_ptk_update(sm) < 0)
-+			SM_ENTER(WPA_PTK, DISCONNECTED);
-+		else
-+			SM_ENTER(WPA_PTK, PTKSTART);
-+	} else switch (sm->wpa_ptk_state) {
- 	case WPA_PTK_INITIALIZE:
- 		break;
- 	case WPA_PTK_DISCONNECT:
--- 
-2.7.4
-

packages/extras-buildpkgs/hostapd/debian/patches/2017-1/0007-TDLS-Reject-TPK-TK-reconfiguration.patch

@@ -1,132 +0,0 @@
-From cfb978ba08fa7acc9e5a4722bb0f3153f941284d Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Fri, 22 Sep 2017 11:03:15 +0300
-Subject: [PATCH 07/12] TDLS: Reject TPK-TK reconfiguration
-
-Do not try to reconfigure the same TPK-TK to the driver after it has
-been successfully configured. This is an explicit check to avoid issues
-related to resetting the TX/RX packet number. There was already a check
-for this for TPK M2 (retries of that message are ignored completely), so
-that behavior does not get modified.
-
-For TPK M3, the TPK-TK could have been reconfigured, but that was
-followed by immediate teardown of the link due to an issue in updating
-the STA entry. Furthermore, for TDLS with any real security (i.e.,
-ignoring open/WEP), the TPK message exchange is protected on the AP path
-and simple replay attacks are not feasible.
-
-As an additional corner case, make sure the local nonce gets updated if
-the peer uses a very unlikely "random nonce" of all zeros.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
- src/rsn_supp/tdls.c | 38 ++++++++++++++++++++++++++++++++++++--
- 1 file changed, 36 insertions(+), 2 deletions(-)
-
-diff --git a/src/rsn_supp/tdls.c b/src/rsn_supp/tdls.c
-index c1d7749..d322f8e 100644
---- a/src/rsn_supp/tdls.c
-+++ b/src/rsn_supp/tdls.c
-@@ -111,6 +111,7 @@ struct wpa_tdls_peer {
- 		u8 tk[16]; /* TPK-TK; assuming only CCMP will be used */
- 	} tpk;
- 	int tpk_set;
-+	int tk_set; /* TPK-TK configured to the driver */
- 	int tpk_success;
- 	int tpk_in_progress;
- 
-@@ -191,6 +192,20 @@ static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer)
- 	u8 rsc[6];
- 	enum wpa_alg alg;
- 
-+	if (peer->tk_set) {
-+		/*
-+		 * This same TPK-TK has already been configured to the driver
-+		 * and this new configuration attempt (likely due to an
-+		 * unexpected retransmitted frame) would result in clearing
-+		 * the TX/RX sequence number which can break security, so must
-+		 * not allow that to happen.
-+		 */
-+		wpa_printf(MSG_INFO, "TDLS: TPK-TK for the peer " MACSTR
-+			   " has already been configured to the driver - do not reconfigure",
-+			   MAC2STR(peer->addr));
-+		return -1;
-+	}
-+
- 	os_memset(rsc, 0, 6);
- 
- 	switch (peer->cipher) {
-@@ -208,12 +223,15 @@ static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer)
- 		return -1;
- 	}
- 
-+	wpa_printf(MSG_DEBUG, "TDLS: Configure pairwise key for peer " MACSTR,
-+		   MAC2STR(peer->addr));
- 	if (wpa_sm_set_key(sm, alg, peer->addr, -1, 1,
- 			   rsc, sizeof(rsc), peer->tpk.tk, key_len) < 0) {
- 		wpa_printf(MSG_WARNING, "TDLS: Failed to set TPK to the "
- 			   "driver");
- 		return -1;
- 	}
-+	peer->tk_set = 1;
- 	return 0;
- }
- 
-@@ -689,7 +707,7 @@ static void wpa_tdls_peer_clear(struct wpa_sm *sm, struct wpa_tdls_peer *peer)
- 	peer->cipher = 0;
- 	peer->qos_info = 0;
- 	peer->wmm_capable = 0;
--	peer->tpk_set = peer->tpk_success = 0;
-+	peer->tk_set = peer->tpk_set = peer->tpk_success = 0;
- 	peer->chan_switch_enabled = 0;
- 	os_memset(&peer->tpk, 0, sizeof(peer->tpk));
- 	os_memset(peer->inonce, 0, WPA_NONCE_LEN);
-@@ -1152,6 +1170,7 @@ skip_rsnie:
- 		wpa_tdls_peer_free(sm, peer);
- 		return -1;
- 	}
-+	peer->tk_set = 0; /* A new nonce results in a new TK */
- 	wpa_hexdump(MSG_DEBUG, "TDLS: Initiator Nonce for TPK handshake",
- 		    peer->inonce, WPA_NONCE_LEN);
- 	os_memcpy(ftie->Snonce, peer->inonce, WPA_NONCE_LEN);
-@@ -1748,6 +1767,19 @@ static int wpa_tdls_addset_peer(struct wpa_sm *sm, struct wpa_tdls_peer *peer,
- }
- 
- 
-+static int tdls_nonce_set(const u8 *nonce)
-+{
-+	int i;
-+
-+	for (i = 0; i < WPA_NONCE_LEN; i++) {
-+		if (nonce[i])
-+			return 1;
-+	}
-+
-+	return 0;
-+}
-+
-+
- static int wpa_tdls_process_tpk_m1(struct wpa_sm *sm, const u8 *src_addr,
- 				   const u8 *buf, size_t len)
- {
-@@ -2001,7 +2033,8 @@ skip_rsn:
- 	peer->rsnie_i_len = kde.rsn_ie_len;
- 	peer->cipher = cipher;
- 
--	if (os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) != 0) {
-+	if (os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) != 0 ||
-+	    !tdls_nonce_set(peer->inonce)) {
- 		/*
- 		 * There is no point in updating the RNonce for every obtained
- 		 * TPK M1 frame (e.g., retransmission due to timeout) with the
-@@ -2017,6 +2050,7 @@ skip_rsn:
- 				"TDLS: Failed to get random data for responder nonce");
- 			goto error;
- 		}
-+		peer->tk_set = 0; /* A new nonce results in a new TK */
- 	}
- 
- #if 0
--- 
-2.7.4
-

packages/extras-buildpkgs/hostapd/debian/patches/2017-1/0011-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch

@@ -1,82 +0,0 @@
-From c19d7e21b6b6cd9815ec90b88a515f9536b96553 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Fri, 22 Sep 2017 12:06:37 +0300
-Subject: [PATCH 11/12] FT: Do not allow multiple Reassociation Response frames
-
-The driver is expected to not report a second association event without
-the station having explicitly request a new association. As such, this
-case should not be reachable. However, since reconfiguring the same
-pairwise or group keys to the driver could result in nonce reuse issues,
-be extra careful here and do an additional state check to avoid this
-even if the local driver ends up somehow accepting an unexpected
-Reassociation Response frame.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
- src/rsn_supp/wpa.c    | 3 +++
- src/rsn_supp/wpa_ft.c | 8 ++++++++
- src/rsn_supp/wpa_i.h  | 1 +
- 3 files changed, 12 insertions(+)
-
-diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
-index 8e28064..f8a11ea 100644
---- a/src/rsn_supp/wpa.c
-+++ b/src/rsn_supp/wpa.c
-@@ -2369,6 +2369,9 @@ void wpa_sm_notify_disassoc(struct wpa_sm *sm)
- #ifdef CONFIG_TDLS
- 	wpa_tdls_disassoc(sm);
- #endif /* CONFIG_TDLS */
-+#ifdef CONFIG_IEEE80211R
-+	sm->ft_reassoc_completed = 0;
-+#endif /* CONFIG_IEEE80211R */
- 
- 	/* Keys are not needed in the WPA state machine anymore */
- 	wpa_sm_drop_sa(sm);
-diff --git a/src/rsn_supp/wpa_ft.c b/src/rsn_supp/wpa_ft.c
-index 06dea05..e8834dd 100644
---- a/src/rsn_supp/wpa_ft.c
-+++ b/src/rsn_supp/wpa_ft.c
-@@ -153,6 +153,7 @@ static u8 * wpa_ft_gen_req_ies(struct wpa_sm *sm, size_t *len,
- 	u16 capab;
- 
- 	sm->ft_completed = 0;
-+	sm->ft_reassoc_completed = 0;
- 
- 	buf_len = 2 + sizeof(struct rsn_mdie) + 2 + sizeof(struct rsn_ftie) +
- 		2 + sm->r0kh_id_len + ric_ies_len + 100;
-@@ -683,6 +684,11 @@ int wpa_ft_validate_reassoc_resp(struct wpa_sm *sm, const u8 *ies,
- 		return -1;
- 	}
- 
-+	if (sm->ft_reassoc_completed) {
-+		wpa_printf(MSG_DEBUG, "FT: Reassociation has already been completed for this FT protocol instance - ignore unexpected retransmission");
-+		return 0;
-+	}
-+
- 	if (wpa_ft_parse_ies(ies, ies_len, &parse) < 0) {
- 		wpa_printf(MSG_DEBUG, "FT: Failed to parse IEs");
- 		return -1;
-@@ -783,6 +789,8 @@ int wpa_ft_validate_reassoc_resp(struct wpa_sm *sm, const u8 *ies,
- 		return -1;
- 	}
- 
-+	sm->ft_reassoc_completed = 1;
-+
- 	if (wpa_ft_process_gtk_subelem(sm, parse.gtk, parse.gtk_len) < 0)
- 		return -1;
- 
-diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h
-index 51753ee..85cc862 100644
---- a/src/rsn_supp/wpa_i.h
-+++ b/src/rsn_supp/wpa_i.h
-@@ -127,6 +127,7 @@ struct wpa_sm {
- 	size_t r0kh_id_len;
- 	u8 r1kh_id[FT_R1KH_ID_LEN];
- 	int ft_completed;
-+	int ft_reassoc_completed;
- 	int over_the_ds_in_progress;
- 	u8 target_ap[ETH_ALEN]; /* over-the-DS target AP */
- 	int set_ptk_after_assoc;
--- 
-2.7.4
-

packages/extras-buildpkgs/hostapd/debian/patches/300-noscan.patch

@@ -1,8 +1,6 @@
-diff --git a/hostapd/config_file.c b/hostapd/config_file.c
-index 5079f69e3..5ddccc216 100644
 --- a/hostapd/config_file.c
 +++ b/hostapd/config_file.c
-@@ -2863,6 +2863,10 @@ static int hostapd_config_fill(struct hostapd_config *conf,
+@@ -3317,6 +3317,10 @@ static int hostapd_config_fill(struct ho
  		}
  #endif /* CONFIG_IEEE80211W */
  #ifdef CONFIG_IEEE80211N
@@ -13,11 +11,9 @@ index 5079f69e3..5ddccc216 100644
  	} else if (os_strcmp(buf, "ieee80211n") == 0) {
  		conf->ieee80211n = atoi(pos);
  	} else if (os_strcmp(buf, "ht_capab") == 0) {
-diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
-index 8c8f7e286..3eae4ef56 100644
 --- a/src/ap/ap_config.h
 +++ b/src/ap/ap_config.h
-@@ -664,6 +664,8 @@ struct hostapd_config {
+@@ -781,6 +781,8 @@ struct hostapd_config {
  
  	int ht_op_mode_fixed;
  	u16 ht_capab;
@@ -26,11 +22,9 @@ index 8c8f7e286..3eae4ef56 100644
  	int ieee80211n;
  	int secondary_channel;
  	int no_pri_sec_switch;
-diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
-index 16887acdf..75012df30 100644
 --- a/src/ap/hw_features.c
 +++ b/src/ap/hw_features.c
-@@ -474,7 +474,8 @@ static int ieee80211n_check_40mhz(struct hostapd_iface *iface)
+@@ -480,7 +480,8 @@ static int ieee80211n_check_40mhz(struct
  	int ret;
  
  	/* Check that HT40 is used and PRI / SEC switch is allowed */
@@ -40,21 +34,19 @@ index 16887acdf..75012df30 100644
  		return 0;
  
  	hostapd_set_state(iface, HAPD_IFACE_HT_SCAN);
-diff --git a/src/ap/ieee802_11_ht.c b/src/ap/ieee802_11_ht.c
-index 5eb1060a2..552bcc9bc 100644
 --- a/src/ap/ieee802_11_ht.c
 +++ b/src/ap/ieee802_11_ht.c
-@@ -244,6 +244,9 @@ void hostapd_2040_coex_action(struct hostapd_data *hapd,
- 	if (!(iface->conf->ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET))
+@@ -252,6 +252,9 @@ void hostapd_2040_coex_action(struct hos
  		return;
+ 	}
  
 +	if (iface->conf->noscan || iface->conf->no_ht_coex)
 +		return;
 +
- 	if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie))
- 		return;
- 
-@@ -368,6 +371,9 @@ void ht40_intolerant_add(struct hostapd_iface *iface, struct sta_info *sta)
+ 	if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie)) {
+ 		wpa_printf(MSG_DEBUG,
+ 			   "Ignore too short 20/40 BSS Coexistence Management frame");
+@@ -412,6 +415,9 @@ void ht40_intolerant_add(struct hostapd_
  	if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G)
  		return;
  

packages/extras-buildpkgs/hostapd/debian/patches/series

@@ -1,12 +0,0 @@
-session-ticket.patch
-0002-Check-for-NULL-qsort-base-pointers.patch
-0005-nl80211-Update-channel-information-after-channel-swi.patch
-0006-Extend-ieee80211_freq_to_channel_ext-to-cover-channe.patch
-300-noscan.patch
-2017-1/0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
-2017-1/0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch
-2017-1/0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch
-2017-1/0005-Prevent-installation-of-an-all-zero-TK.patch
-2017-1/0006-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch
-2017-1/0007-TDLS-Reject-TPK-TK-reconfiguration.patch
-2017-1/0011-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch

patch/kernel/meson64-dev/0001-ARM64-defconfig-enable-CEC-support.patch

@@ -0,0 +1,44 @@
+From c15f679e5fab966e7f5fcca1afd2d270d61ec20f Mon Sep 17 00:00:00 2001
+From: Jerome Brunet <jbrunet@baylibre.com>
+Date: Mon, 13 Nov 2017 12:09:40 +0100
+Subject: [PATCH] ARM64: defconfig: enable CEC support
+
+Turn on CONFIG_CEC_SUPPORT and CONFIG_CEC_PLATFORM_DRIVERS
+Turn on CONFIG_VIDEO_MESON_AO_CEC as module
+Turn on CONFIG_DRM_DW_HDMI_CEC as module
+
+Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
+Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
+---
+ arch/arm64/configs/defconfig | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
+index c9a57d11330b..c65bf96aff06 100644
+--- a/arch/arm64/configs/defconfig
++++ b/arch/arm64/configs/defconfig
+@@ -427,6 +427,7 @@ CONFIG_MEDIA_SUPPORT=m
+ CONFIG_MEDIA_CAMERA_SUPPORT=y
+ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
++CONFIG_MEDIA_CEC_SUPPORT=y
+ CONFIG_MEDIA_CONTROLLER=y
+ CONFIG_VIDEO_V4L2_SUBDEV_API=y
+ # CONFIG_DVB_NET is not set
+@@ -438,6 +439,8 @@ CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
+ CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
+ CONFIG_VIDEO_RENESAS_FCP=m
+ CONFIG_VIDEO_RENESAS_VSP1=m
++CONFIG_CEC_PLATFORM_DRIVERS=y
++CONFIG_VIDEO_MESON_AO_CEC=m
+ CONFIG_DRM=m
+ CONFIG_DRM_NOUVEAU=m
+ CONFIG_DRM_EXYNOS=m
+@@ -459,6 +462,7 @@ CONFIG_DRM_RCAR_LVDS=m
+ CONFIG_DRM_TEGRA=m
+ CONFIG_DRM_PANEL_SIMPLE=m
+ CONFIG_DRM_I2C_ADV7511=m
++CONFIG_DRM_DW_HDMI_CEC=m
+ CONFIG_DRM_VC4=m
+ CONFIG_DRM_HISI_HIBMC=m
+ CONFIG_DRM_HISI_KIRIN=m

patch/kernel/meson64-dev/0002-ASoC-meson-add-meson-audio-core-driver.patch

@@ -1,4 +1,4 @@
-From 4770a464de7b87bc849e4e110f197ef9fa7bccf6 Mon Sep 17 00:00:00 2001
+From 156a10a996db8f8896ead168acbb96ad58c577a5 Mon Sep 17 00:00:00 2001
 From: Jerome Brunet <jbrunet@baylibre.com>
 Date: Thu, 30 Mar 2017 11:49:55 +0200
 Subject: [PATCH] ASoC: meson: add meson audio core driver
@@ -15,53 +15,75 @@ of the S905 (gxbb). This datasheet is available here: [0].
 [0]: http://dn.odroid.com/S905/DataSheet/S905_Public_Datasheet_V1.1.4.pdf
 
 Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
-
 ---
- sound/soc/meson/Kconfig      |  10 +++
- sound/soc/meson/Makefile     |   4 +
- sound/soc/meson/audio-core.c | 190 +++++++++++++++++++++++++++++++++++++++++++
- sound/soc/meson/audio-core.h |  28 +++++++
- 4 files changed, 232 insertions(+)
- create mode 100644 sound/soc/meson/audio-core.c
- create mode 100644 sound/soc/meson/audio-core.h
+ sound/soc/Kconfig               |   1 +
+ sound/soc/Makefile              |   1 +
+ sound/soc/meson-gx/Kconfig      |  11 ++
+ sound/soc/meson-gx/Makefile     |   3 +
+ sound/soc/meson-gx/audio-core.c | 180 ++++++++++++++++++++++++++++++++
+ sound/soc/meson-gx/audio-core.h |  28 +++++
+ 6 files changed, 224 insertions(+)
+ create mode 100644 sound/soc/meson-gx/Kconfig
+ create mode 100644 sound/soc/meson-gx/Makefile
+ create mode 100644 sound/soc/meson-gx/audio-core.c
+ create mode 100644 sound/soc/meson-gx/audio-core.h
 
-diff --git a/sound/soc/meson/Kconfig b/sound/soc/meson/Kconfig
-index 8af8bc3..ed432d4 100644
---- a/sound/soc/meson/Kconfig
-+++ b/sound/soc/meson/Kconfig
-@@ -63,3 +63,13 @@ config SND_MESON_AXG_SPDIFOUT
- 	  in the Amlogic AXG SoC family
- 
- endmenu
-+
-+menuconfig SND_SOC_MESON
-+	tristate "ASoC support for Amlogic Meson SoCs"
+diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
+index 1cf11cf51e1d..4bdbbf5d55a3 100644
+--- a/sound/soc/Kconfig
++++ b/sound/soc/Kconfig
+@@ -58,6 +58,7 @@ source "sound/soc/img/Kconfig"
+ source "sound/soc/intel/Kconfig"
+ source "sound/soc/mediatek/Kconfig"
+ source "sound/soc/meson/Kconfig"
++source "sound/soc/meson-gx/Kconfig"
+ source "sound/soc/mxs/Kconfig"
+ source "sound/soc/pxa/Kconfig"
+ source "sound/soc/qcom/Kconfig"
+diff --git a/sound/soc/Makefile b/sound/soc/Makefile
+index 62a5f87c3cfc..ed03666674ec 100644
+--- a/sound/soc/Makefile
++++ b/sound/soc/Makefile
+@@ -39,6 +39,7 @@ obj-$(CONFIG_SND_SOC)	+= img/
+ obj-$(CONFIG_SND_SOC)	+= intel/
+ obj-$(CONFIG_SND_SOC)	+= mediatek/
+ obj-$(CONFIG_SND_SOC)	+= meson/
++obj-$(CONFIG_SND_SOC)	+= meson-gx/
+ obj-$(CONFIG_SND_SOC)	+= mxs/
+ obj-$(CONFIG_SND_SOC)	+= nuc900/
+ obj-$(CONFIG_SND_SOC)	+= omap/
+diff --git a/sound/soc/meson-gx/Kconfig b/sound/soc/meson-gx/Kconfig
+new file mode 100644
+index 000000000000..280e49e7c16f
+--- /dev/null
++++ b/sound/soc/meson-gx/Kconfig
+@@ -0,0 +1,11 @@
++menuconfig SND_SOC_MESON_GX
++	tristate "ASoC WIP support for Amlogic GX SoCs"
 +	depends on ARCH_MESON
 +	select MFD_CORE
 +	select REGMAP_MMIO
 +	help
 +	  Say Y or M if you want to add support for codecs attached to
 +	  the Amlogic Meson SoCs Audio interfaces. You will also need to
-+	  select the audio interfaces to support below.
-diff --git a/sound/soc/meson/Makefile b/sound/soc/meson/Makefile
-index c5e003b..768d7c4 100644
---- a/sound/soc/meson/Makefile
-+++ b/sound/soc/meson/Makefile
-@@ -19,3 +19,7 @@ obj-$(CONFIG_SND_MESON_AXG_TDMIN) += snd-soc-meson-axg-tdmin.o
- obj-$(CONFIG_SND_MESON_AXG_TDMOUT) += snd-soc-meson-axg-tdmout.o
- obj-$(CONFIG_SND_MESON_AXG_SOUND_CARD) += snd-soc-meson-axg-sound-card.o
- obj-$(CONFIG_SND_MESON_AXG_SPDIFOUT) += snd-soc-meson-axg-spdifout.o
-+
++	  select the audio interfaces to support below. This WIP drivers
++	  are kept separated from the actual upstream amlogic ASoC driver
++	  to minimize conflicts until support is submitted and merged
+diff --git a/sound/soc/meson-gx/Makefile b/sound/soc/meson-gx/Makefile
+new file mode 100644
+index 000000000000..6f124c31a85c
+--- /dev/null
++++ b/sound/soc/meson-gx/Makefile
+@@ -0,0 +1,3 @@
 +snd-soc-meson-audio-core-objs	 := audio-core.o
 +
-+obj-$(CONFIG_SND_SOC_MESON) += snd-soc-meson-audio-core.o
-\ No newline at end of file
-diff --git a/sound/soc/meson/audio-core.c b/sound/soc/meson/audio-core.c
++obj-$(CONFIG_SND_SOC_MESON_GX)		+= snd-soc-meson-audio-core.o
+diff --git a/sound/soc/meson-gx/audio-core.c b/sound/soc/meson-gx/audio-core.c
 new file mode 100644
-index 0000000..99993ec
+index 000000000000..68f7e0e58f5f
 --- /dev/null
-+++ b/sound/soc/meson/audio-core.c
-@@ -0,0 +1,190 @@
++++ b/sound/soc/meson-gx/audio-core.c
+@@ -0,0 +1,180 @@
 +/*
 + * Copyright (C) 2017 BayLibre, SAS
 + * Author: Jerome Brunet <jbrunet@baylibre.com>
@@ -91,7 +113,7 @@ index 0000000..99993ec
 +
 +#include "audio-core.h"
 +
-+#define DRV_NAME "meson-audio-core"
++#define DRV_NAME "meson-gx-audio-core"
 +
 +static const char * const acore_clock_names[] = { "aiu_top",
 +						  "aiu_glue",
@@ -165,20 +187,12 @@ index 0000000..99993ec
 +
 +static const struct mfd_cell meson_acore_devs[] = {
 +	{
-+		.name = "meson-i2s-dai",
-+		.of_compatible = "amlogic,meson-i2s-dai",
++		.name = "meson-aiu-i2s",
++		.of_compatible = "amlogic,meson-aiu-i2s",
 +	},
 +	{
-+		.name = "meson-spdif-dai",
-+		.of_compatible = "amlogic,meson-spdif-dai",
-+	},
-+	{
-+		.name = "meson-aiu-i2s-dma",
-+		.of_compatible = "amlogic,meson-aiu-i2s-dma",
-+	},
-+	{
-+		.name = "meson-aiu-spdif-dma",
-+		.of_compatible = "amlogic,meson-aiu-spdif-dma",
++		.name = "meson-aiu-spdif",
++		.of_compatible = "amlogic,meson-aiu-spdif",
 +	},
 +};
 +
@@ -233,9 +247,7 @@ index 0000000..99993ec
 +}
 +
 +static const struct of_device_id meson_acore_of_match[] = {
-+	{ .compatible = "amlogic,meson-audio-core", },
-+	{ .compatible = "amlogic,meson-gxbb-audio-core", },
-+	{ .compatible = "amlogic,meson-gxl-audio-core", },
++	{ .compatible = "amlogic,meson-gx-audio-core", },
 +	{}
 +};
 +MODULE_DEVICE_TABLE(of, meson_acore_of_match);
@@ -252,11 +264,11 @@ index 0000000..99993ec
 +MODULE_DESCRIPTION("Meson Audio Core Driver");
 +MODULE_AUTHOR("Jerome Brunet <jbrunet@baylibre.com>");
 +MODULE_LICENSE("GPL v2");
-diff --git a/sound/soc/meson/audio-core.h b/sound/soc/meson/audio-core.h
+diff --git a/sound/soc/meson-gx/audio-core.h b/sound/soc/meson-gx/audio-core.h
 new file mode 100644
-index 0000000..6e7a24c
+index 000000000000..6e7a24cdc4a9
 --- /dev/null
-+++ b/sound/soc/meson/audio-core.h
++++ b/sound/soc/meson-gx/audio-core.h
 @@ -0,0 +1,28 @@
 +/*
 + * Copyright (C) 2017 BayLibre, SAS

patch/kernel/meson64-dev/0003-ASoC-meson-add-register-definitions.patch

@@ -1,4 +1,4 @@
-From dc1d93ea8dc61686364e2659c1ac1392681b64b4 Mon Sep 17 00:00:00 2001
+From e7c8a6ef764c104ae805f2436c95df03399cc8a9 Mon Sep 17 00:00:00 2001
 From: Jerome Brunet <jbrunet@baylibre.com>
 Date: Thu, 30 Mar 2017 12:00:10 +0200
 Subject: [PATCH] ASoC: meson: add register definitions
@@ -6,19 +6,18 @@ Subject: [PATCH] ASoC: meson: add register definitions
 Add the register definition for the AIU and AUDIN blocks
 
 Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
-
 ---
- sound/soc/meson/aiu-regs.h   | 182 +++++++++++++++++++++++++++++++++++++++++++
- sound/soc/meson/audin-regs.h | 148 +++++++++++++++++++++++++++++++++++
+ sound/soc/meson-gx/aiu-regs.h   | 182 ++++++++++++++++++++++++++++++++
+ sound/soc/meson-gx/audin-regs.h | 148 ++++++++++++++++++++++++++
  2 files changed, 330 insertions(+)
- create mode 100644 sound/soc/meson/aiu-regs.h
- create mode 100644 sound/soc/meson/audin-regs.h
+ create mode 100644 sound/soc/meson-gx/aiu-regs.h
+ create mode 100644 sound/soc/meson-gx/audin-regs.h
 
-diff --git a/sound/soc/meson/aiu-regs.h b/sound/soc/meson/aiu-regs.h
+diff --git a/sound/soc/meson-gx/aiu-regs.h b/sound/soc/meson-gx/aiu-regs.h
 new file mode 100644
-index 0000000..67391e6
+index 000000000000..67391e64fe1c
 --- /dev/null
-+++ b/sound/soc/meson/aiu-regs.h
++++ b/sound/soc/meson-gx/aiu-regs.h
 @@ -0,0 +1,182 @@
 +/*
 + * Copyright (C) 2017 BayLibre, SAS
@@ -202,11 +201,11 @@ index 0000000..67391e6
 +#define AIU_I2S_CBUS_DDR_ADDR		0x2AC
 +
 +#endif /* _AIU_REGS_H_ */
-diff --git a/sound/soc/meson/audin-regs.h b/sound/soc/meson/audin-regs.h
+diff --git a/sound/soc/meson-gx/audin-regs.h b/sound/soc/meson-gx/audin-regs.h
 new file mode 100644
-index 0000000..f224610
+index 000000000000..f224610e80e7
 --- /dev/null
-+++ b/sound/soc/meson/audin-regs.h
++++ b/sound/soc/meson-gx/audin-regs.h
 @@ -0,0 +1,148 @@
 +/*
 + * Copyright (C) 2017 BayLibre, SAS

patch/kernel/meson64-dev/0004-ASoC-meson-add-aiu-i2s-dma-support.patch

@@ -1,422 +0,0 @@
-From ef53207463b1ffa58dbc8b994cb470f35bf12420 Mon Sep 17 00:00:00 2001
-From: Jerome Brunet <jbrunet@baylibre.com>
-Date: Thu, 30 Mar 2017 12:14:40 +0200
-Subject: [PATCH] ASoC: meson: add aiu i2s dma support
-
-Add support for the i2s output dma which is part of the AIU block
-
-Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
-
----
- sound/soc/meson/Kconfig       |   7 +
- sound/soc/meson/Makefile      |   4 +-
- sound/soc/meson/aiu-i2s-dma.c | 370 ++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 380 insertions(+), 1 deletion(-)
- create mode 100644 sound/soc/meson/aiu-i2s-dma.c
-
-diff --git a/sound/soc/meson/Kconfig b/sound/soc/meson/Kconfig
-index ed432d4..6e030b5 100644
---- a/sound/soc/meson/Kconfig
-+++ b/sound/soc/meson/Kconfig
-@@ -73,3 +73,10 @@ menuconfig SND_SOC_MESON
- 	  Say Y or M if you want to add support for codecs attached to
- 	  the Amlogic Meson SoCs Audio interfaces. You will also need to
- 	  select the audio interfaces to support below.
-+
-+config SND_SOC_MESON_I2S
-+	tristate "Meson i2s interface"
-+	depends on SND_SOC_MESON
-+	help
-+	  Say Y or M if you want to add support for i2s dma driver for Amlogic
-+	  Meson SoCs.
-diff --git a/sound/soc/meson/Makefile b/sound/soc/meson/Makefile
-index 768d7c4..5796007 100644
---- a/sound/soc/meson/Makefile
-+++ b/sound/soc/meson/Makefile
-@@ -21,5 +21,7 @@ obj-$(CONFIG_SND_MESON_AXG_SOUND_CARD) += snd-soc-meson-axg-sound-card.o
- obj-$(CONFIG_SND_MESON_AXG_SPDIFOUT) += snd-soc-meson-axg-spdifout.o
- 
- snd-soc-meson-audio-core-objs	 := audio-core.o
-+snd-soc-meson-aiu-i2s-dma-objs	 := aiu-i2s-dma.o
- 
--obj-$(CONFIG_SND_SOC_MESON) += snd-soc-meson-audio-core.o
-\ No newline at end of file
-+obj-$(CONFIG_SND_SOC_MESON) += snd-soc-meson-audio-core.o
-+obj-$(CONFIG_SND_SOC_MESON_I2S)	+= snd-soc-meson-aiu-i2s-dma.o
-\ No newline at end of file
-diff --git a/sound/soc/meson/aiu-i2s-dma.c b/sound/soc/meson/aiu-i2s-dma.c
-new file mode 100644
-index 0000000..2684bd0
---- /dev/null
-+++ b/sound/soc/meson/aiu-i2s-dma.c
-@@ -0,0 +1,370 @@
-+/*
-+ * Copyright (C) 2017 BayLibre, SAS
-+ * Author: Jerome Brunet <jbrunet@baylibre.com>
-+ * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of the
-+ * License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <linux/clk.h>
-+#include <linux/mfd/syscon.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/platform_device.h>
-+#include <linux/regmap.h>
-+
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+
-+#include "aiu-regs.h"
-+#include "audio-core.h"
-+
-+#define DRV_NAME "meson-aiu-i2s-dma"
-+
-+struct aiu_i2s_dma {
-+	struct meson_audio_core_data *core;
-+	struct clk *fast;
-+	int irq;
-+};
-+
-+#define AIU_MEM_I2S_BUF_CNTL_INIT		BIT(0)
-+#define AIU_MEM_I2S_CONTROL_INIT		BIT(0)
-+#define AIU_MEM_I2S_CONTROL_FILL_EN		BIT(1)
-+#define AIU_MEM_I2S_CONTROL_EMPTY_EN		BIT(2)
-+#define AIU_MEM_I2S_CONTROL_MODE_16BIT		BIT(6)
-+#define AIU_MEM_I2S_CONTROL_BUSY		BIT(7)
-+#define AIU_MEM_I2S_CONTROL_DATA_READY		BIT(8)
-+#define AIU_MEM_I2S_CONTROL_LEVEL_CNTL		BIT(9)
-+#define AIU_MEM_I2S_MASKS_IRQ_BLOCK_MASK	GENMASK(31, 16)
-+#define AIU_MEM_I2S_MASKS_IRQ_BLOCK(n)		((n) << 16)
-+#define AIU_MEM_I2S_MASKS_CH_MEM_MASK		GENMASK(15, 8)
-+#define AIU_MEM_I2S_MASKS_CH_MEM(ch)		((ch) << 8)
-+#define AIU_MEM_I2S_MASKS_CH_RD_MASK		GENMASK(7, 0)
-+#define AIU_MEM_I2S_MASKS_CH_RD(ch)		((ch) << 0)
-+#define AIU_RST_SOFT_I2S_FAST_DOMAIN		BIT(0)
-+#define AIU_RST_SOFT_I2S_SLOW_DOMAIN		BIT(1)
-+
-+/*
-+ * The DMA works by i2s "blocks" (or DMA burst). The burst size and the memory
-+ * layout expected depends on the mode of operation.
-+ *
-+ * - Normal mode: The channels are expected to be packed in 32 bytes groups
-+ *  interleaved the buffer. AIU_MEM_I2S_MASKS_CH_MEM is a bitfield representing
-+ *  the channels present in memory. AIU_MEM_I2S_MASKS_CH_MEM represents the
-+ *  channels read by the DMA. This is very flexible but the unsual memory layout
-+ *  makes it less easy to deal with. The burst size is 32 bytes times the number
-+ *  of channels read.
-+ *
-+ * - Split mode:
-+ * Classical channel interleaved frame organisation. In this mode,
-+ * AIU_MEM_I2S_MASKS_CH_MEM and AIU_MEM_I2S_MASKS_CH_MEM must be set to 0xff and
-+ * the burst size is fixed to 256 bytes. The input can be either 2 or 8
-+ * channels.
-+ *
-+ * The following driver implements the split mode.
-+ */
-+
-+#define AIU_I2S_DMA_BURST 256
-+
-+static struct snd_pcm_hardware aiu_i2s_dma_hw = {
-+	.info = (SNDRV_PCM_INFO_INTERLEAVED |
-+		 SNDRV_PCM_INFO_MMAP |
-+		 SNDRV_PCM_INFO_MMAP_VALID |
-+		 SNDRV_PCM_INFO_PAUSE),
-+
-+	.formats = (SNDRV_PCM_FMTBIT_S16_LE |
-+		    SNDRV_PCM_FMTBIT_S24_LE |
-+		    SNDRV_PCM_FMTBIT_S32_LE),
-+
-+	/*
-+	 * TODO: The DMA can change the endianness, the msb position
-+	 * and deal with unsigned - support this later on
-+	 */
-+
-+	.rate_min = 8000,
-+	.rate_max = 192000,
-+	.channels_min = 2,
-+	.channels_max = 8,
-+	.period_bytes_min = AIU_I2S_DMA_BURST,
-+	.period_bytes_max = AIU_I2S_DMA_BURST * 65535,
-+	.periods_min = 2,
-+	.periods_max = UINT_MAX,
-+	.buffer_bytes_max = 1 * 1024 * 1024,
-+	.fifo_size = 0,
-+};
-+
-+static struct aiu_i2s_dma *aiu_i2s_dma_priv(struct snd_pcm_substream *s)
-+{
-+	struct snd_soc_pcm_runtime *rtd = s->private_data;
-+	struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);
-+
-+	return snd_soc_component_get_drvdata(component);
-+}
-+
-+static snd_pcm_uframes_t
-+aiu_i2s_dma_pointer(struct snd_pcm_substream *substream)
-+{
-+	struct snd_pcm_runtime *runtime = substream->runtime;
-+	struct aiu_i2s_dma *priv = aiu_i2s_dma_priv(substream);
-+	unsigned int addr;
-+	int ret;
-+
-+	ret = regmap_read(priv->core->aiu, AIU_MEM_I2S_RD_PTR,
-+			  &addr);
-+	if (ret)
-+		return 0;
-+
-+	return bytes_to_frames(runtime, addr - (unsigned int)runtime->dma_addr);
-+}
-+
-+static void __dma_enable(struct aiu_i2s_dma *priv, bool enable)
-+{
-+	unsigned int en_mask = (AIU_MEM_I2S_CONTROL_FILL_EN |
-+				AIU_MEM_I2S_CONTROL_EMPTY_EN);
-+
-+	regmap_update_bits(priv->core->aiu, AIU_MEM_I2S_CONTROL, en_mask,
-+			   enable ? en_mask : 0);
-+
-+}
-+
-+static int aiu_i2s_dma_trigger(struct snd_pcm_substream *substream, int cmd)
-+{
-+	struct aiu_i2s_dma *priv = aiu_i2s_dma_priv(substream);
-+
-+	switch (cmd) {
-+	case SNDRV_PCM_TRIGGER_START:
-+	case SNDRV_PCM_TRIGGER_RESUME:
-+	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-+		__dma_enable(priv, true);
-+		break;
-+	case SNDRV_PCM_TRIGGER_SUSPEND:
-+	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-+	case SNDRV_PCM_TRIGGER_STOP:
-+		__dma_enable(priv, false);
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
-+static void __dma_init_mem(struct aiu_i2s_dma *priv)
-+{
-+	regmap_update_bits(priv->core->aiu, AIU_MEM_I2S_CONTROL,
-+			   AIU_MEM_I2S_CONTROL_INIT,
-+			   AIU_MEM_I2S_CONTROL_INIT);
-+	regmap_update_bits(priv->core->aiu, AIU_MEM_I2S_BUF_CNTL,
-+			   AIU_MEM_I2S_BUF_CNTL_INIT,
-+			   AIU_MEM_I2S_BUF_CNTL_INIT);
-+
-+	regmap_update_bits(priv->core->aiu, AIU_MEM_I2S_CONTROL,
-+			   AIU_MEM_I2S_CONTROL_INIT,
-+			   0);
-+	regmap_update_bits(priv->core->aiu, AIU_MEM_I2S_BUF_CNTL,
-+			   AIU_MEM_I2S_BUF_CNTL_INIT,
-+			   0);
-+}
-+
-+static int aiu_i2s_dma_prepare(struct snd_pcm_substream *substream)
-+{
-+	struct aiu_i2s_dma *priv = aiu_i2s_dma_priv(substream);
-+
-+	__dma_init_mem(priv);
-+
-+	return 0;
-+}
-+
-+static int aiu_i2s_dma_hw_params(struct snd_pcm_substream *substream,
-+				 struct snd_pcm_hw_params *params)
-+{
-+	struct snd_pcm_runtime *runtime = substream->runtime;
-+	struct aiu_i2s_dma *priv = aiu_i2s_dma_priv(substream);
-+	int ret;
-+	u32 burst_num, mem_ctl;
-+	dma_addr_t end_ptr;
-+
-+	ret = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
-+	if (ret < 0)
-+		return ret;
-+
-+	/* Setup memory layout */
-+	if (params_physical_width(params) == 16)
-+		mem_ctl = AIU_MEM_I2S_CONTROL_MODE_16BIT;
-+	else
-+		mem_ctl = 0;
-+
-+	regmap_update_bits(priv->core->aiu, AIU_MEM_I2S_CONTROL,
-+			   AIU_MEM_I2S_CONTROL_MODE_16BIT,
-+			   mem_ctl);
-+
-+	/* Initialize memory pointers */
-+	regmap_write(priv->core->aiu, AIU_MEM_I2S_START_PTR, runtime->dma_addr);
-+	regmap_write(priv->core->aiu, AIU_MEM_I2S_RD_PTR, runtime->dma_addr);
-+
-+	/* The end pointer is the address of the last valid block */
-+	end_ptr = runtime->dma_addr + runtime->dma_bytes - AIU_I2S_DMA_BURST;
-+	regmap_write(priv->core->aiu, AIU_MEM_I2S_END_PTR, end_ptr);
-+
-+	/* Memory masks */
-+	burst_num = params_period_bytes(params) / AIU_I2S_DMA_BURST;
-+	regmap_write(priv->core->aiu, AIU_MEM_I2S_MASKS,
-+		     AIU_MEM_I2S_MASKS_CH_RD(0xff) |
-+		     AIU_MEM_I2S_MASKS_CH_MEM(0xff) |
-+		     AIU_MEM_I2S_MASKS_IRQ_BLOCK(burst_num));
-+
-+	return 0;
-+}
-+
-+static int aiu_i2s_dma_hw_free(struct snd_pcm_substream *substream)
-+{
-+	return snd_pcm_lib_free_pages(substream);
-+}
-+
-+
-+static irqreturn_t aiu_i2s_dma_irq_block(int irq, void *dev_id)
-+{
-+	struct snd_pcm_substream *playback = dev_id;
-+
-+	snd_pcm_period_elapsed(playback);
-+
-+	return IRQ_HANDLED;
-+}
-+
-+static int aiu_i2s_dma_open(struct snd_pcm_substream *substream)
-+{
-+	struct aiu_i2s_dma *priv = aiu_i2s_dma_priv(substream);
-+	int ret;
-+
-+	snd_soc_set_runtime_hwparams(substream, &aiu_i2s_dma_hw);
-+
-+	/*
-+	 * Make sure the buffer and period size are multiple of the DMA burst
-+	 * size
-+	 */
-+	ret = snd_pcm_hw_constraint_step(substream->runtime, 0,
-+					 SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
-+					 AIU_I2S_DMA_BURST);
-+	if (ret)
-+		return ret;
-+
-+	ret = snd_pcm_hw_constraint_step(substream->runtime, 0,
-+					 SNDRV_PCM_HW_PARAM_PERIOD_BYTES,
-+					 AIU_I2S_DMA_BURST);
-+	if (ret)
-+		return ret;
-+
-+	/* Request the I2S DDR irq */
-+	ret = request_irq(priv->irq, aiu_i2s_dma_irq_block, 0,
-+			  DRV_NAME, substream);
-+	if (ret)
-+		return ret;
-+
-+	/* Power up the i2s fast domain - can't write the registers w/o it */
-+	ret = clk_prepare_enable(priv->fast);
-+	if (ret)
-+		return ret;
-+
-+	/* Make sure the dma is initially disabled */
-+	__dma_enable(priv, false);
-+
-+	return 0;
-+}
-+
-+static int aiu_i2s_dma_close(struct snd_pcm_substream *substream)
-+{
-+	struct aiu_i2s_dma *priv = aiu_i2s_dma_priv(substream);
-+
-+	clk_disable_unprepare(priv->fast);
-+	free_irq(priv->irq, substream);
-+
-+	return 0;
-+}
-+
-+static const struct snd_pcm_ops aiu_i2s_dma_ops = {
-+	.open =		aiu_i2s_dma_open,
-+	.close =        aiu_i2s_dma_close,
-+	.ioctl =	snd_pcm_lib_ioctl,
-+	.hw_params =	aiu_i2s_dma_hw_params,
-+	.hw_free =      aiu_i2s_dma_hw_free,
-+	.prepare =      aiu_i2s_dma_prepare,
-+	.pointer =	aiu_i2s_dma_pointer,
-+	.trigger =	aiu_i2s_dma_trigger,
-+};
-+
-+static int aiu_i2s_dma_new(struct snd_soc_pcm_runtime *rtd)
-+{
-+	struct snd_card *card = rtd->card->snd_card;
-+	size_t size = aiu_i2s_dma_hw.buffer_bytes_max;
-+
-+	return snd_pcm_lib_preallocate_pages_for_all(rtd->pcm,
-+						     SNDRV_DMA_TYPE_DEV,
-+						     card->dev, size, size);
-+}
-+
-+static const struct snd_soc_component_driver aiu_i2s_platform = {
-+	.ops = &aiu_i2s_dma_ops,
-+	.pcm_new = aiu_i2s_dma_new,
-+	.name = DRV_NAME,
-+};
-+
-+static int aiu_i2s_dma_probe(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct aiu_i2s_dma *priv;
-+
-+	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
-+	if (!priv)
-+		return -ENOMEM;
-+
-+	platform_set_drvdata(pdev, priv);
-+	priv->core = dev_get_drvdata(dev->parent);
-+
-+	priv->fast = devm_clk_get(dev, "fast");
-+	if (IS_ERR(priv->fast)) {
-+		if (PTR_ERR(priv->fast) != -EPROBE_DEFER)
-+			dev_err(dev, "Can't get i2s fast domain clock\n");
-+		return PTR_ERR(priv->fast);
-+	}
-+
-+	priv->irq = platform_get_irq(pdev, 0);
-+	if (priv->irq <= 0) {
-+		dev_err(dev, "Can't get i2s ddr irq\n");
-+		return priv->irq;
-+	}
-+
-+	return devm_snd_soc_register_component(dev, &aiu_i2s_platform,
-+					       NULL, 0);
-+}
-+
-+static const struct of_device_id aiu_i2s_dma_of_match[] = {
-+	{ .compatible = "amlogic,meson-aiu-i2s-dma", },
-+	{ .compatible = "amlogic,meson-gxbb-aiu-i2s-dma", },
-+	{ .compatible = "amlogic,meson-gxl-aiu-i2s-dma", },
-+	{}
-+};
-+MODULE_DEVICE_TABLE(of, aiu_i2s_dma_of_match);
-+
-+static struct platform_driver aiu_i2s_dma_pdrv = {
-+	.probe = aiu_i2s_dma_probe,
-+	.driver = {
-+		.name = DRV_NAME,
-+		.of_match_table = aiu_i2s_dma_of_match,
-+	},
-+};
-+module_platform_driver(aiu_i2s_dma_pdrv);
-+
-+MODULE_DESCRIPTION("Meson AIU i2s DMA ASoC Driver");
-+MODULE_AUTHOR("Jerome Brunet <jbrunet@baylibre.com>");
-+MODULE_LICENSE("GPL v2");

patch/kernel/meson64-dev/0004-ASoC-meson-add-initial-aiu-i2s-support.patch

@@ -0,0 +1,797 @@
+From b0b05db26fa7e8f858bccfca04abe4f6e4396ebc Mon Sep 17 00:00:00 2001
+From: Jerome Brunet <jbrunet@baylibre.com>
+Date: Thu, 30 Mar 2017 12:17:27 +0200
+Subject: [PATCH] ASoC: meson: add initial aiu i2s support
+
+Add support for the aiu i2s found on Amlogic Meson SoC family.
+With this initial implementation, only playback is supported.
+Capture will be part of furture work.
+
+Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
+---
+ sound/soc/meson-gx/Kconfig   |   8 +
+ sound/soc/meson-gx/Makefile  |   3 +
+ sound/soc/meson-gx/aiu-i2s.c | 747 +++++++++++++++++++++++++++++++++++
+ 3 files changed, 758 insertions(+)
+ create mode 100644 sound/soc/meson-gx/aiu-i2s.c
+
+diff --git a/sound/soc/meson-gx/Kconfig b/sound/soc/meson-gx/Kconfig
+index 280e49e7c16f..8ec683cdf327 100644
+--- a/sound/soc/meson-gx/Kconfig
++++ b/sound/soc/meson-gx/Kconfig
+@@ -9,3 +9,11 @@ menuconfig SND_SOC_MESON_GX
+ 	  select the audio interfaces to support below. This WIP drivers
+ 	  are kept separated from the actual upstream amlogic ASoC driver
+ 	  to minimize conflicts until support is submitted and merged
++
++config SND_SOC_MESON_GX_I2S
++	tristate "Meson i2s interface"
++	depends on SND_SOC_MESON_GX
++	help
++	  Say Y or M if you want to add support for i2s driver for Amlogic
++	  Meson SoCs.
++
+diff --git a/sound/soc/meson-gx/Makefile b/sound/soc/meson-gx/Makefile
+index 6f124c31a85c..02f9c4df6348 100644
+--- a/sound/soc/meson-gx/Makefile
++++ b/sound/soc/meson-gx/Makefile
+@@ -1,3 +1,6 @@
+ snd-soc-meson-audio-core-objs	 := audio-core.o
++snd-soc-meson-aiu-i2s-objs	 := aiu-i2s.o
+ 
+ obj-$(CONFIG_SND_SOC_MESON_GX)		+= snd-soc-meson-audio-core.o
++obj-$(CONFIG_SND_SOC_MESON_GX_I2S)	+= snd-soc-meson-aiu-i2s.o
++
+diff --git a/sound/soc/meson-gx/aiu-i2s.c b/sound/soc/meson-gx/aiu-i2s.c
+new file mode 100644
+index 000000000000..d57f351b502f
+--- /dev/null
++++ b/sound/soc/meson-gx/aiu-i2s.c
+@@ -0,0 +1,747 @@
++/*
++ * Copyright (C) 2017 BayLibre, SAS
++ * Author: Jerome Brunet <jbrunet@baylibre.com>
++ * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <linux/clk.h>
++#include <linux/mfd/syscon.h>
++#include <linux/module.h>
++#include <linux/of.h>
++#include <linux/platform_device.h>
++#include <linux/regmap.h>
++
++#include <sound/pcm_params.h>
++#include <sound/soc.h>
++#include <sound/soc-dai.h>
++
++#include "aiu-regs.h"
++#include "audio-core.h"
++
++#define DRV_NAME "meson-aiu-i2s"
++
++struct meson_aiu_i2s {
++	struct meson_audio_core_data *core;
++	struct clk *mclk;
++	struct clk *bclks;
++	struct clk *iface;
++	struct clk *fast;
++	bool bclks_idle;
++	int irq;
++};
++
++#define AIU_MEM_I2S_BUF_CNTL_INIT		BIT(0)
++#define AIU_MEM_I2S_CONTROL_INIT		BIT(0)
++#define AIU_MEM_I2S_CONTROL_FILL_EN		BIT(1)
++#define AIU_MEM_I2S_CONTROL_EMPTY_EN		BIT(2)
++#define AIU_MEM_I2S_CONTROL_MODE_16BIT		BIT(6)
++#define AIU_MEM_I2S_CONTROL_BUSY		BIT(7)
++#define AIU_MEM_I2S_CONTROL_DATA_READY		BIT(8)
++#define AIU_MEM_I2S_CONTROL_LEVEL_CNTL		BIT(9)
++#define AIU_MEM_I2S_MASKS_IRQ_BLOCK_MASK	GENMASK(31, 16)
++#define AIU_MEM_I2S_MASKS_IRQ_BLOCK(n)		((n) << 16)
++#define AIU_MEM_I2S_MASKS_CH_MEM_MASK		GENMASK(15, 8)
++#define AIU_MEM_I2S_MASKS_CH_MEM(ch)		((ch) << 8)
++#define AIU_MEM_I2S_MASKS_CH_RD_MASK		GENMASK(7, 0)
++#define AIU_MEM_I2S_MASKS_CH_RD(ch)		((ch) << 0)
++#define AIU_RST_SOFT_I2S_FAST_DOMAIN		BIT(0)
++#define AIU_RST_SOFT_I2S_SLOW_DOMAIN		BIT(1)
++
++/*
++ * The DMA works by i2s "blocks" (or DMA burst). The burst size and the memory
++ * layout expected depends on the mode of operation.
++ *
++ * - Normal mode: The channels are expected to be packed in 32 bytes groups
++ *  interleaved the buffer. AIU_MEM_I2S_MASKS_CH_MEM is a bitfield representing
++ *  the channels present in memory. AIU_MEM_I2S_MASKS_CH_MEM represents the
++ *  channels read by the DMA. This is very flexible but the unsual memory layout
++ *  makes it less easy to deal with. The burst size is 32 bytes times the number
++ *  of channels read.
++ *
++ * - Split mode:
++ * Classical channel interleaved frame organisation. In this mode,
++ * AIU_MEM_I2S_MASKS_CH_MEM and AIU_MEM_I2S_MASKS_CH_MEM must be set to 0xff and
++ * the burst size is fixed to 256 bytes. The input can be either 2 or 8
++ * channels.
++ *
++ * The following driver implements the split mode.
++ */
++
++#define AIU_I2S_DMA_BURST 256
++
++static struct snd_pcm_hardware meson_aiu_i2s_dma_hw = {
++	.info = (SNDRV_PCM_INFO_INTERLEAVED |
++		 SNDRV_PCM_INFO_MMAP |
++		 SNDRV_PCM_INFO_MMAP_VALID |
++		 SNDRV_PCM_INFO_PAUSE),
++
++	.formats = (SNDRV_PCM_FMTBIT_S16_LE |
++		    SNDRV_PCM_FMTBIT_S24_LE |
++		    SNDRV_PCM_FMTBIT_S32_LE),
++
++	/*
++	 * TODO: The DMA can change the endianness, the msb position
++	 * and deal with unsigned - support this later on
++	 */
++
++	.rate_min = 8000,
++	.rate_max = 192000,
++	.channels_min = 2,
++	.channels_max = 8,
++	.period_bytes_min = AIU_I2S_DMA_BURST,
++	.period_bytes_max = AIU_I2S_DMA_BURST * 65535,
++	.periods_min = 2,
++	.periods_max = UINT_MAX,
++	.buffer_bytes_max = 1 * 1024 * 1024,
++	.fifo_size = 0,
++};
++
++static struct meson_aiu_i2s *meson_aiu_i2s_dma_priv(struct snd_pcm_substream *s)
++{
++	struct snd_soc_pcm_runtime *rtd = s->private_data;
++	struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);
++
++	return snd_soc_component_get_drvdata(component);
++}
++
++static snd_pcm_uframes_t
++meson_aiu_i2s_dma_pointer(struct snd_pcm_substream *substream)
++{
++	struct snd_pcm_runtime *runtime = substream->runtime;
++	struct meson_aiu_i2s *priv = meson_aiu_i2s_dma_priv(substream);
++	unsigned int addr;
++	int ret;
++
++	ret = regmap_read(priv->core->aiu, AIU_MEM_I2S_RD_PTR,
++			  &addr);
++	if (ret)
++		return 0;
++
++	return bytes_to_frames(runtime, addr - (unsigned int)runtime->dma_addr);
++}
++
++static void __dma_enable(struct meson_aiu_i2s *priv, bool enable)
++{
++	unsigned int en_mask = (AIU_MEM_I2S_CONTROL_FILL_EN |
++				AIU_MEM_I2S_CONTROL_EMPTY_EN);
++
++	regmap_update_bits(priv->core->aiu, AIU_MEM_I2S_CONTROL, en_mask,
++			   enable ? en_mask : 0);
++
++}
++
++static int meson_aiu_i2s_dma_trigger(struct snd_pcm_substream *substream, int cmd)
++{
++	struct meson_aiu_i2s *priv = meson_aiu_i2s_dma_priv(substream);
++
++	switch (cmd) {
++	case SNDRV_PCM_TRIGGER_START:
++	case SNDRV_PCM_TRIGGER_RESUME:
++	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
++		__dma_enable(priv, true);
++		break;
++	case SNDRV_PCM_TRIGGER_SUSPEND:
++	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
++	case SNDRV_PCM_TRIGGER_STOP:
++		__dma_enable(priv, false);
++		break;
++	default:
++		return -EINVAL;
++	}
++
++	return 0;
++}
++
++static void __dma_init_mem(struct meson_aiu_i2s *priv)
++{
++	regmap_update_bits(priv->core->aiu, AIU_MEM_I2S_CONTROL,
++			   AIU_MEM_I2S_CONTROL_INIT,
++			   AIU_MEM_I2S_CONTROL_INIT);
++	regmap_update_bits(priv->core->aiu, AIU_MEM_I2S_BUF_CNTL,
++			   AIU_MEM_I2S_BUF_CNTL_INIT,
++			   AIU_MEM_I2S_BUF_CNTL_INIT);
++
++	regmap_update_bits(priv->core->aiu, AIU_MEM_I2S_CONTROL,
++			   AIU_MEM_I2S_CONTROL_INIT,
++			   0);
++	regmap_update_bits(priv->core->aiu, AIU_MEM_I2S_BUF_CNTL,
++			   AIU_MEM_I2S_BUF_CNTL_INIT,
++			   0);
++}
++
++static int meson_aiu_i2s_dma_prepare(struct snd_pcm_substream *substream)
++{
++	struct meson_aiu_i2s *priv = meson_aiu_i2s_dma_priv(substream);
++
++	__dma_init_mem(priv);
++
++	return 0;
++}
++
++static int meson_aiu_i2s_dma_hw_params(struct snd_pcm_substream *substream,
++				 struct snd_pcm_hw_params *params)
++{
++	struct snd_pcm_runtime *runtime = substream->runtime;
++	struct meson_aiu_i2s *priv = meson_aiu_i2s_dma_priv(substream);
++	int ret;
++	u32 burst_num, mem_ctl;
++	dma_addr_t end_ptr;
++
++	ret = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
++	if (ret < 0)
++		return ret;
++
++	/* Setup memory layout */
++	if (params_physical_width(params) == 16)
++		mem_ctl = AIU_MEM_I2S_CONTROL_MODE_16BIT;
++	else
++		mem_ctl = 0;
++
++	regmap_update_bits(priv->core->aiu, AIU_MEM_I2S_CONTROL,
++			   AIU_MEM_I2S_CONTROL_MODE_16BIT,
++			   mem_ctl);
++
++	/* Initialize memory pointers */
++	regmap_write(priv->core->aiu, AIU_MEM_I2S_START_PTR, runtime->dma_addr);
++	regmap_write(priv->core->aiu, AIU_MEM_I2S_RD_PTR, runtime->dma_addr);
++
++	/* The end pointer is the address of the last valid block */
++	end_ptr = runtime->dma_addr + runtime->dma_bytes - AIU_I2S_DMA_BURST;
++	regmap_write(priv->core->aiu, AIU_MEM_I2S_END_PTR, end_ptr);
++
++	/* Memory masks */
++	burst_num = params_period_bytes(params) / AIU_I2S_DMA_BURST;
++	regmap_write(priv->core->aiu, AIU_MEM_I2S_MASKS,
++		     AIU_MEM_I2S_MASKS_CH_RD(0xff) |
++		     AIU_MEM_I2S_MASKS_CH_MEM(0xff) |
++		     AIU_MEM_I2S_MASKS_IRQ_BLOCK(burst_num));
++
++	return 0;
++}
++
++static int meson_aiu_i2s_dma_hw_free(struct snd_pcm_substream *substream)
++{
++	return snd_pcm_lib_free_pages(substream);
++}
++
++
++static irqreturn_t meson_aiu_i2s_dma_irq_block(int irq, void *dev_id)
++{
++	struct snd_pcm_substream *playback = dev_id;
++
++	snd_pcm_period_elapsed(playback);
++
++	return IRQ_HANDLED;
++}
++
++static int meson_aiu_i2s_dma_open(struct snd_pcm_substream *substream)
++{
++	struct meson_aiu_i2s *priv = meson_aiu_i2s_dma_priv(substream);
++	int ret;
++
++	snd_soc_set_runtime_hwparams(substream, &meson_aiu_i2s_dma_hw);
++
++	/*
++	 * Make sure the buffer and period size are multiple of the DMA burst
++	 * size
++	 */
++	ret = snd_pcm_hw_constraint_step(substream->runtime, 0,
++					 SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
++					 AIU_I2S_DMA_BURST);
++	if (ret)
++		return ret;
++
++	ret = snd_pcm_hw_constraint_step(substream->runtime, 0,
++					 SNDRV_PCM_HW_PARAM_PERIOD_BYTES,
++					 AIU_I2S_DMA_BURST);
++	if (ret)
++		return ret;
++
++	/* Request the I2S DDR irq */
++	ret = request_irq(priv->irq, meson_aiu_i2s_dma_irq_block, 0,
++			  DRV_NAME, substream);
++	if (ret)
++		return ret;
++
++	/* Power up the i2s fast domain - can't write the registers w/o it */
++	ret = clk_prepare_enable(priv->fast);
++	if (ret)
++		return ret;
++
++	/* Make sure the dma is initially disabled */
++	__dma_enable(priv, false);
++
++	return 0;
++}
++
++static int meson_aiu_i2s_dma_close(struct snd_pcm_substream *substream)
++{
++	struct meson_aiu_i2s *priv = meson_aiu_i2s_dma_priv(substream);
++
++	clk_disable_unprepare(priv->fast);
++	free_irq(priv->irq, substream);
++
++	return 0;
++}
++
++static const struct snd_pcm_ops meson_aiu_i2s_dma_ops = {
++	.open =		meson_aiu_i2s_dma_open,
++	.close =        meson_aiu_i2s_dma_close,
++	.ioctl =	snd_pcm_lib_ioctl,
++	.hw_params =	meson_aiu_i2s_dma_hw_params,
++	.hw_free =      meson_aiu_i2s_dma_hw_free,
++	.prepare =      meson_aiu_i2s_dma_prepare,
++	.pointer =	meson_aiu_i2s_dma_pointer,
++	.trigger =	meson_aiu_i2s_dma_trigger,
++};
++
++static int meson_aiu_i2s_dma_new(struct snd_soc_pcm_runtime *rtd)
++{
++	struct snd_card *card = rtd->card->snd_card;
++	size_t size = meson_aiu_i2s_dma_hw.buffer_bytes_max;
++
++	return snd_pcm_lib_preallocate_pages_for_all(rtd->pcm,
++						     SNDRV_DMA_TYPE_DEV,
++						     card->dev, size, size);
++}
++
++#define AIU_CLK_CTRL_I2S_DIV_EN			BIT(0)
++#define AIU_CLK_CTRL_I2S_DIV_MASK		GENMASK(3, 2)
++#define AIU_CLK_CTRL_AOCLK_POLARITY_MASK	BIT(6)
++#define AIU_CLK_CTRL_AOCLK_POLARITY_NORMAL	(0 << 6)
++#define AIU_CLK_CTRL_AOCLK_POLARITY_INVERTED	(1 << 6)
++#define AIU_CLK_CTRL_ALRCLK_POLARITY_MASK	BIT(7)
++#define AIU_CLK_CTRL_ALRCLK_POLARITY_NORMAL	(0 << 7)
++#define AIU_CLK_CTRL_ALRCLK_POLARITY_INVERTED	(1 << 7)
++#define AIU_CLK_CTRL_ALRCLK_SKEW_MASK		GENMASK(9, 8)
++#define AIU_CLK_CTRL_ALRCLK_LEFT_J		(0 << 8)
++#define AIU_CLK_CTRL_ALRCLK_I2S			(1 << 8)
++#define AIU_CLK_CTRL_ALRCLK_RIGHT_J		(2 << 8)
++#define AIU_CLK_CTRL_MORE_I2S_DIV_MASK		GENMASK(5, 0)
++#define AIU_CLK_CTRL_MORE_I2S_DIV(div)		(((div) - 1) << 0)
++#define AIU_CODEC_DAC_LRCLK_CTRL_DIV_MASK	GENMASK(11, 0)
++#define AIU_CODEC_DAC_LRCLK_CTRL_DIV(div)	(((div) - 1) << 0)
++#define AIU_I2S_DAC_CFG_PAYLOAD_SIZE_MASK	GENMASK(1, 0)
++#define AIU_I2S_DAC_CFG_AOCLK_32		(0 << 0)
++#define AIU_I2S_DAC_CFG_AOCLK_48		(2 << 0)
++#define AIU_I2S_DAC_CFG_AOCLK_64		(3 << 0)
++#define AIU_I2S_MISC_HOLD_EN			BIT(2)
++#define AIU_I2S_SOURCE_DESC_MODE_8CH		BIT(0)
++#define AIU_I2S_SOURCE_DESC_MODE_24BIT		BIT(5)
++#define AIU_I2S_SOURCE_DESC_MODE_32BIT		BIT(9)
++#define AIU_I2S_SOURCE_DESC_MODE_SPLIT		BIT(11)
++
++static void __hold(struct meson_aiu_i2s *priv, bool enable)
++{
++	regmap_update_bits(priv->core->aiu, AIU_I2S_MISC,
++			   AIU_I2S_MISC_HOLD_EN,
++			   enable ? AIU_I2S_MISC_HOLD_EN : 0);
++}
++
++static void __divider_enable(struct meson_aiu_i2s *priv, bool enable)
++{
++	regmap_update_bits(priv->core->aiu, AIU_CLK_CTRL,
++			   AIU_CLK_CTRL_I2S_DIV_EN,
++			   enable ? AIU_CLK_CTRL_I2S_DIV_EN : 0);
++}
++
++static void __playback_start(struct meson_aiu_i2s *priv)
++{
++	__divider_enable(priv, true);
++	__hold(priv, false);
++}
++
++static void __playback_stop(struct meson_aiu_i2s *priv, bool clk_force)
++{
++	__hold(priv, true);
++	/* Disable the bit clks if necessary */
++	if (clk_force || !priv->bclks_idle)
++		__divider_enable(priv, false);
++}
++
++static int meson_aiu_i2s_dai_trigger(struct snd_pcm_substream *substream, int cmd,
++				 struct snd_soc_dai *dai)
++{
++	struct meson_aiu_i2s *priv = snd_soc_dai_get_drvdata(dai);
++	bool clk_force_stop = false;
++
++	switch (cmd) {
++	case SNDRV_PCM_TRIGGER_START:
++	case SNDRV_PCM_TRIGGER_RESUME:
++	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
++		__playback_start(priv);
++		return 0;
++
++	case SNDRV_PCM_TRIGGER_STOP:
++	case SNDRV_PCM_TRIGGER_SUSPEND:
++		clk_force_stop = true;
++	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
++		__playback_stop(priv, clk_force_stop);
++		return 0;
++
++	default:
++		return -EINVAL;
++	}
++}
++
++static int __bclks_set_rate(struct meson_aiu_i2s *priv, unsigned int srate,
++			    unsigned int width)
++{
++	unsigned int fs;
++
++	/* Get the oversampling factor */
++	fs = DIV_ROUND_CLOSEST(clk_get_rate(priv->mclk), srate);
++
++	/*
++	 * This DAI is usually connected to the dw-hdmi which does not support
++	 * bclk being 32 * lrclk or 48 * lrclk
++	 * Restrict to blck = 64 * lrclk
++	 */
++	if (fs % 64)
++		return -EINVAL;
++
++	/* Set the divider between lrclk and bclk */
++	regmap_update_bits(priv->core->aiu, AIU_I2S_DAC_CFG,
++			   AIU_I2S_DAC_CFG_PAYLOAD_SIZE_MASK,
++			   AIU_I2S_DAC_CFG_AOCLK_64);
++
++	regmap_update_bits(priv->core->aiu, AIU_CODEC_DAC_LRCLK_CTRL,
++			   AIU_CODEC_DAC_LRCLK_CTRL_DIV_MASK,
++			   AIU_CODEC_DAC_LRCLK_CTRL_DIV(64));
++
++	/* Use CLK_MORE for the i2s divider */
++	regmap_update_bits(priv->core->aiu, AIU_CLK_CTRL,
++			   AIU_CLK_CTRL_I2S_DIV_MASK,
++			   0);
++
++	regmap_update_bits(priv->core->aiu, AIU_CLK_CTRL_MORE,
++			   AIU_CLK_CTRL_MORE_I2S_DIV_MASK,
++			   AIU_CLK_CTRL_MORE_I2S_DIV(fs / 64));
++
++	return 0;
++}
++
++static int __setup_desc(struct meson_aiu_i2s *priv, unsigned int width,
++			unsigned int channels)
++{
++	u32 desc = 0;
++
++	switch (width) {
++	case 24:
++		/*
++		 * For some reason, 24 bits wide audio don't play well
++		 * if the 32 bits mode is not set
++		 */
++		desc |= (AIU_I2S_SOURCE_DESC_MODE_24BIT |
++			 AIU_I2S_SOURCE_DESC_MODE_32BIT);
++		break;
++	case 16:
++		break;
++
++	default:
++		return -EINVAL;
++	}
++
++	switch (channels) {
++	case 2: /* Nothing to do */
++		break;
++	case 8:
++		/* TODO: Still requires testing ... */
++		desc |= AIU_I2S_SOURCE_DESC_MODE_8CH;
++		break;
++	default:
++		return -EINVAL;
++	}
++
++	regmap_update_bits(priv->core->aiu, AIU_I2S_SOURCE_DESC,
++			   AIU_I2S_SOURCE_DESC_MODE_8CH |
++			   AIU_I2S_SOURCE_DESC_MODE_24BIT |
++			   AIU_I2S_SOURCE_DESC_MODE_32BIT,
++			   desc);
++
++	return 0;
++}
++
++static int meson_aiu_i2s_dai_hw_params(struct snd_pcm_substream *substream,
++				   struct snd_pcm_hw_params *params,
++				   struct snd_soc_dai *dai)
++{
++	struct meson_aiu_i2s *priv = snd_soc_dai_get_drvdata(dai);
++	unsigned int width = params_width(params);
++	unsigned int channels = params_channels(params);
++	unsigned int rate = params_rate(params);
++	int ret;
++
++	ret = __setup_desc(priv, width, channels);
++	if (ret) {
++		dev_err(dai->dev, "Unable set to set i2s description\n");
++		return ret;
++	}
++
++	ret = __bclks_set_rate(priv, rate, width);
++	if (ret) {
++		dev_err(dai->dev, "Unable set to the i2s clock rates\n");
++		return ret;
++	}
++
++	return 0;
++}
++
++static int meson_aiu_i2s_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
++{
++	struct meson_aiu_i2s *priv = snd_soc_dai_get_drvdata(dai);
++	u32 val;
++
++	if ((fmt & SND_SOC_DAIFMT_MASTER_MASK) != SND_SOC_DAIFMT_CBS_CFS)
++		return -EINVAL;
++
++	/* DAI output mode */
++	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
++	case SND_SOC_DAIFMT_I2S:
++		val = AIU_CLK_CTRL_ALRCLK_I2S;
++		break;
++	case SND_SOC_DAIFMT_LEFT_J:
++		val = AIU_CLK_CTRL_ALRCLK_LEFT_J;
++		break;
++	case SND_SOC_DAIFMT_RIGHT_J:
++		val = AIU_CLK_CTRL_ALRCLK_RIGHT_J;
++		break;
++	default:
++		return -EINVAL;
++	}
++
++	regmap_update_bits(priv->core->aiu, AIU_CLK_CTRL,
++			   AIU_CLK_CTRL_ALRCLK_SKEW_MASK,
++			   val);
++
++	/* DAI clock polarity */
++	switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
++	case SND_SOC_DAIFMT_IB_IF:
++		/* Invert both clocks */
++		val = AIU_CLK_CTRL_ALRCLK_POLARITY_INVERTED |
++			AIU_CLK_CTRL_AOCLK_POLARITY_INVERTED;
++		break;
++	case SND_SOC_DAIFMT_IB_NF:
++		/* Invert bit clock */
++		val = AIU_CLK_CTRL_ALRCLK_POLARITY_NORMAL |
++			AIU_CLK_CTRL_AOCLK_POLARITY_INVERTED;
++		break;
++	case SND_SOC_DAIFMT_NB_IF:
++		/* Invert frame clock */
++		val = AIU_CLK_CTRL_ALRCLK_POLARITY_INVERTED |
++			AIU_CLK_CTRL_AOCLK_POLARITY_NORMAL;
++		break;
++	case SND_SOC_DAIFMT_NB_NF:
++		/* Normal clocks */
++		val = AIU_CLK_CTRL_ALRCLK_POLARITY_NORMAL |
++			AIU_CLK_CTRL_AOCLK_POLARITY_NORMAL;
++		break;
++	default:
++		return -EINVAL;
++	}
++
++	regmap_update_bits(priv->core->aiu, AIU_CLK_CTRL,
++			   AIU_CLK_CTRL_ALRCLK_POLARITY_MASK |
++			   AIU_CLK_CTRL_AOCLK_POLARITY_MASK,
++			   val);
++
++	switch (fmt & SND_SOC_DAIFMT_CLOCK_MASK) {
++	case SND_SOC_DAIFMT_CONT:
++		priv->bclks_idle = true;
++		break;
++	case SND_SOC_DAIFMT_GATED:
++		priv->bclks_idle = false;
++		break;
++	default:
++		return -EINVAL;
++	}
++
++	return 0;
++}
++
++static int meson_aiu_i2s_dai_set_sysclk(struct snd_soc_dai *dai, int clk_id,
++				    unsigned int freq, int dir)
++{
++	struct meson_aiu_i2s *priv = snd_soc_dai_get_drvdata(dai);
++	int ret;
++
++	if (WARN_ON(clk_id != 0))
++		return -EINVAL;
++
++	if (dir == SND_SOC_CLOCK_IN)
++		return 0;
++
++	ret = clk_set_rate(priv->mclk, freq);
++	if (ret) {
++		dev_err(dai->dev, "Failed to set sysclk to %uHz", freq);
++		return ret;
++	}
++
++	return 0;
++}
++
++static int meson_aiu_i2s_dai_startup(struct snd_pcm_substream *substream,
++				 struct snd_soc_dai *dai)
++{
++	struct meson_aiu_i2s *priv = snd_soc_dai_get_drvdata(dai);
++	int ret;
++
++	/* Power up the i2s fast domain - can't write the registers w/o it */
++	ret = clk_prepare_enable(priv->fast);
++	if (ret)
++		goto out_clk_fast;
++
++	/* Make sure nothing gets out of the DAI yet */
++	__hold(priv, true);
++
++	/* I2S encoder needs the mixer interface gate */
++	ret = clk_prepare_enable(priv->iface);
++	if (ret)
++		goto out_clk_iface;
++
++	/* Enable the i2s master clock */
++	ret = clk_prepare_enable(priv->mclk);
++	if (ret)
++		goto out_mclk;
++
++	/* Enable the bit clock gate */
++	ret = clk_prepare_enable(priv->bclks);
++	if (ret)
++		goto out_bclks;
++
++	/* Make sure the interface expect a memory layout we can work with */
++	regmap_update_bits(priv->core->aiu, AIU_I2S_SOURCE_DESC,
++			   AIU_I2S_SOURCE_DESC_MODE_SPLIT,
++			   AIU_I2S_SOURCE_DESC_MODE_SPLIT);
++
++	return 0;
++
++out_bclks:
++	clk_disable_unprepare(priv->mclk);
++out_mclk:
++	clk_disable_unprepare(priv->iface);
++out_clk_iface:
++	clk_disable_unprepare(priv->fast);
++out_clk_fast:
++	return ret;
++}
++
++static void meson_aiu_i2s_dai_shutdown(struct snd_pcm_substream *substream,
++				   struct snd_soc_dai *dai)
++{
++	struct meson_aiu_i2s *priv = snd_soc_dai_get_drvdata(dai);
++
++	clk_disable_unprepare(priv->bclks);
++	clk_disable_unprepare(priv->mclk);
++	clk_disable_unprepare(priv->iface);
++	clk_disable_unprepare(priv->fast);
++}
++
++static const struct snd_soc_dai_ops meson_aiu_i2s_dai_ops = {
++	.startup    = meson_aiu_i2s_dai_startup,
++	.shutdown   = meson_aiu_i2s_dai_shutdown,
++	.trigger    = meson_aiu_i2s_dai_trigger,
++	.hw_params  = meson_aiu_i2s_dai_hw_params,
++	.set_fmt    = meson_aiu_i2s_dai_set_fmt,
++	.set_sysclk = meson_aiu_i2s_dai_set_sysclk,
++};
++
++static struct snd_soc_dai_driver meson_aiu_i2s_dai = {
++	.playback = {
++		.stream_name = "Playback",
++		.channels_min = 2,
++		.channels_max = 8,
++		.rates = SNDRV_PCM_RATE_8000_192000,
++		.formats = (SNDRV_PCM_FMTBIT_S16_LE |
++			    SNDRV_PCM_FMTBIT_S24_LE)
++	},
++	.ops = &meson_aiu_i2s_dai_ops,
++};
++
++static const struct snd_soc_component_driver meson_aiu_i2s_component = {
++	.ops = &meson_aiu_i2s_dma_ops,
++	.pcm_new = meson_aiu_i2s_dma_new,
++	.name	= DRV_NAME,
++};
++
++static int meson_aiu_i2s_probe(struct platform_device *pdev)
++{
++	struct device *dev = &pdev->dev;
++	struct meson_aiu_i2s *priv;
++
++	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
++	if (!priv)
++		return -ENOMEM;
++
++	platform_set_drvdata(pdev, priv);
++	priv->core = dev_get_drvdata(dev->parent);
++
++	priv->fast = devm_clk_get(dev, "fast");
++	if (IS_ERR(priv->fast)) {
++		if (PTR_ERR(priv->fast) != -EPROBE_DEFER)
++			dev_err(dev, "Can't get the i2s fast domain clock\n");
++		return PTR_ERR(priv->fast);
++	}
++
++	priv->iface = devm_clk_get(dev, "iface");
++	if (IS_ERR(priv->iface)) {
++		if (PTR_ERR(priv->iface) != -EPROBE_DEFER)
++			dev_err(dev, "Can't get i2s dai clock gate\n");
++		return PTR_ERR(priv->iface);
++	}
++
++	priv->bclks = devm_clk_get(dev, "bclks");
++	if (IS_ERR(priv->bclks)) {
++		if (PTR_ERR(priv->bclks) != -EPROBE_DEFER)
++			dev_err(dev, "Can't get bit clocks gate\n");
++		return PTR_ERR(priv->bclks);
++	}
++
++	priv->mclk = devm_clk_get(dev, "mclk");
++	if (IS_ERR(priv->mclk)) {
++		if (PTR_ERR(priv->mclk) != -EPROBE_DEFER)
++			dev_err(dev, "failed to get the i2s master clock\n");
++		return PTR_ERR(priv->mclk);
++	}
++
++	priv->irq = platform_get_irq(pdev, 0);
++	if (priv->irq <= 0) {
++		dev_err(dev, "Can't get i2s ddr irq\n");
++		return priv->irq;
++	}
++
++	return devm_snd_soc_register_component(dev, &meson_aiu_i2s_component,
++					       &meson_aiu_i2s_dai, 1);
++}
++
++static const struct of_device_id meson_aiu_i2s_of_match[] = {
++	{ .compatible = "amlogic,meson-aiu-i2s", },
++	{}
++};
++MODULE_DEVICE_TABLE(of, meson_aiu_i2s_of_match);
++
++static struct platform_driver meson_aiu_i2s_pdrv = {
++	.probe = meson_aiu_i2s_probe,
++	.driver = {
++		.name = DRV_NAME,
++		.of_match_table = meson_aiu_i2s_of_match,
++	},
++};
++module_platform_driver(meson_aiu_i2s_pdrv);
++
++MODULE_DESCRIPTION("Meson AIU i2s ASoC Driver");
++MODULE_AUTHOR("Jerome Brunet <jbrunet@baylibre.com>");
++MODULE_LICENSE("GPL v2");

patch/kernel/meson64-dev/0005-ASoC-meson-add-initial-i2s-dai-support.patch

@@ -1,516 +0,0 @@
-From 9031b415030a316ec4ca513185e2d2c0fbb894c4 Mon Sep 17 00:00:00 2001
-From: Jerome Brunet <jbrunet@baylibre.com>
-Date: Thu, 30 Mar 2017 12:17:27 +0200
-Subject: [PATCH] ASoC: meson: add initial i2s dai support
-
-Add support for the i2s dai found on Amlogic Meson SoC family.
-With this initial implementation, only playback is supported.
-Capture will be part of furture work.
-
-Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
-
----
- sound/soc/meson/Kconfig   |   2 +-
- sound/soc/meson/Makefile  |   4 +-
- sound/soc/meson/i2s-dai.c | 465 ++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 469 insertions(+), 2 deletions(-)
- create mode 100644 sound/soc/meson/i2s-dai.c
-
-diff --git a/sound/soc/meson/Kconfig b/sound/soc/meson/Kconfig
-index 6e030b5..5904e9e 100644
---- a/sound/soc/meson/Kconfig
-+++ b/sound/soc/meson/Kconfig
-@@ -78,5 +78,5 @@ config SND_SOC_MESON_I2S
- 	tristate "Meson i2s interface"
- 	depends on SND_SOC_MESON
- 	help
--	  Say Y or M if you want to add support for i2s dma driver for Amlogic
-+	  Say Y or M if you want to add support for i2s driver for Amlogic
- 	  Meson SoCs.
-diff --git a/sound/soc/meson/Makefile b/sound/soc/meson/Makefile
-index 5796007..b8641f9 100644
---- a/sound/soc/meson/Makefile
-+++ b/sound/soc/meson/Makefile
-@@ -22,6 +22,8 @@ obj-$(CONFIG_SND_MESON_AXG_SPDIFOUT) += snd-soc-meson-axg-spdifout.o
- 
- snd-soc-meson-audio-core-objs	 := audio-core.o
- snd-soc-meson-aiu-i2s-dma-objs	 := aiu-i2s-dma.o
-+snd-soc-meson-i2s-dai-objs	 := i2s-dai.o
- 
- obj-$(CONFIG_SND_SOC_MESON) += snd-soc-meson-audio-core.o
--obj-$(CONFIG_SND_SOC_MESON_I2S)	+= snd-soc-meson-aiu-i2s-dma.o
-\ No newline at end of file
-+obj-$(CONFIG_SND_SOC_MESON_I2S)	+= snd-soc-meson-aiu-i2s-dma.o
-+obj-$(CONFIG_SND_SOC_MESON_I2S)	+= snd-soc-meson-i2s-dai.o
-\ No newline at end of file
-diff --git a/sound/soc/meson/i2s-dai.c b/sound/soc/meson/i2s-dai.c
-new file mode 100644
-index 0000000..1008af8
---- /dev/null
-+++ b/sound/soc/meson/i2s-dai.c
-@@ -0,0 +1,465 @@
-+/*
-+ * Copyright (C) 2017 BayLibre, SAS
-+ * Author: Jerome Brunet <jbrunet@baylibre.com>
-+ * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of the
-+ * License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <linux/clk.h>
-+#include <linux/mfd/syscon.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/platform_device.h>
-+#include <linux/regmap.h>
-+
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+#include <sound/soc-dai.h>
-+
-+#include "aiu-regs.h"
-+#include "audio-core.h"
-+
-+#define DRV_NAME "meson-i2s-dai"
-+
-+struct meson_i2s_dai {
-+	struct meson_audio_core_data *core;
-+	struct clk *mclk;
-+	struct clk *bclks;
-+	struct clk *iface;
-+	struct clk *fast;
-+	bool bclks_idle;
-+};
-+
-+#define AIU_CLK_CTRL_I2S_DIV_EN			BIT(0)
-+#define AIU_CLK_CTRL_I2S_DIV_MASK		GENMASK(3, 2)
-+#define AIU_CLK_CTRL_AOCLK_POLARITY_MASK	BIT(6)
-+#define AIU_CLK_CTRL_AOCLK_POLARITY_NORMAL	(0 << 6)
-+#define AIU_CLK_CTRL_AOCLK_POLARITY_INVERTED	(1 << 6)
-+#define AIU_CLK_CTRL_ALRCLK_POLARITY_MASK	BIT(7)
-+#define AIU_CLK_CTRL_ALRCLK_POLARITY_NORMAL	(0 << 7)
-+#define AIU_CLK_CTRL_ALRCLK_POLARITY_INVERTED	(1 << 7)
-+#define AIU_CLK_CTRL_ALRCLK_SKEW_MASK		GENMASK(9, 8)
-+#define AIU_CLK_CTRL_ALRCLK_LEFT_J		(0 << 8)
-+#define AIU_CLK_CTRL_ALRCLK_I2S			(1 << 8)
-+#define AIU_CLK_CTRL_ALRCLK_RIGHT_J		(2 << 8)
-+#define AIU_CLK_CTRL_MORE_I2S_DIV_MASK		GENMASK(5, 0)
-+#define AIU_CLK_CTRL_MORE_I2S_DIV(div)		(((div) - 1) << 0)
-+#define AIU_CODEC_DAC_LRCLK_CTRL_DIV_MASK	GENMASK(11, 0)
-+#define AIU_CODEC_DAC_LRCLK_CTRL_DIV(div)	(((div) - 1) << 0)
-+#define AIU_I2S_DAC_CFG_PAYLOAD_SIZE_MASK	GENMASK(1, 0)
-+#define AIU_I2S_DAC_CFG_AOCLK_32		(0 << 0)
-+#define AIU_I2S_DAC_CFG_AOCLK_48		(2 << 0)
-+#define AIU_I2S_DAC_CFG_AOCLK_64		(3 << 0)
-+#define AIU_I2S_MISC_HOLD_EN			BIT(2)
-+#define AIU_I2S_SOURCE_DESC_MODE_8CH		BIT(0)
-+#define AIU_I2S_SOURCE_DESC_MODE_24BIT		BIT(5)
-+#define AIU_I2S_SOURCE_DESC_MODE_32BIT		BIT(9)
-+#define AIU_I2S_SOURCE_DESC_MODE_SPLIT		BIT(11)
-+
-+static void __hold(struct meson_i2s_dai *priv, bool enable)
-+{
-+	regmap_update_bits(priv->core->aiu, AIU_I2S_MISC,
-+			   AIU_I2S_MISC_HOLD_EN,
-+			   enable ? AIU_I2S_MISC_HOLD_EN : 0);
-+}
-+
-+static void __divider_enable(struct meson_i2s_dai *priv, bool enable)
-+{
-+	regmap_update_bits(priv->core->aiu, AIU_CLK_CTRL,
-+			   AIU_CLK_CTRL_I2S_DIV_EN,
-+			   enable ? AIU_CLK_CTRL_I2S_DIV_EN : 0);
-+}
-+
-+static void __playback_start(struct meson_i2s_dai *priv)
-+{
-+	__divider_enable(priv, true);
-+	__hold(priv, false);
-+}
-+
-+static void __playback_stop(struct meson_i2s_dai *priv, bool clk_force)
-+{
-+	__hold(priv, true);
-+	/* Disable the bit clks if necessary */
-+	if (clk_force || !priv->bclks_idle)
-+		__divider_enable(priv, false);
-+}
-+
-+static int meson_i2s_dai_trigger(struct snd_pcm_substream *substream, int cmd,
-+				 struct snd_soc_dai *dai)
-+{
-+	struct meson_i2s_dai *priv = snd_soc_dai_get_drvdata(dai);
-+	bool clk_force_stop = false;
-+
-+	switch (cmd) {
-+	case SNDRV_PCM_TRIGGER_START:
-+	case SNDRV_PCM_TRIGGER_RESUME:
-+	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-+		__playback_start(priv);
-+		return 0;
-+
-+	case SNDRV_PCM_TRIGGER_STOP:
-+	case SNDRV_PCM_TRIGGER_SUSPEND:
-+		clk_force_stop = true;
-+	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-+		__playback_stop(priv, clk_force_stop);
-+		return 0;
-+
-+	default:
-+		return -EINVAL;
-+	}
-+}
-+
-+static int __bclks_set_rate(struct meson_i2s_dai *priv, unsigned int srate,
-+			    unsigned int width)
-+{
-+	unsigned int fs;
-+
-+	/* Get the oversampling factor */
-+	fs = DIV_ROUND_CLOSEST(clk_get_rate(priv->mclk), srate);
-+
-+	/*
-+	 * This DAI is usually connected to the dw-hdmi which does not support
-+	 * bclk being 32 * lrclk or 48 * lrclk
-+	 * Restrict to blck = 64 * lrclk
-+	 */
-+	if (fs % 64)
-+		return -EINVAL;
-+
-+	/* Set the divider between lrclk and bclk */
-+	regmap_update_bits(priv->core->aiu, AIU_I2S_DAC_CFG,
-+			   AIU_I2S_DAC_CFG_PAYLOAD_SIZE_MASK,
-+			   AIU_I2S_DAC_CFG_AOCLK_64);
-+
-+	regmap_update_bits(priv->core->aiu, AIU_CODEC_DAC_LRCLK_CTRL,
-+			   AIU_CODEC_DAC_LRCLK_CTRL_DIV_MASK,
-+			   AIU_CODEC_DAC_LRCLK_CTRL_DIV(64));
-+
-+	/* Use CLK_MORE for the i2s divider */
-+	regmap_update_bits(priv->core->aiu, AIU_CLK_CTRL,
-+			   AIU_CLK_CTRL_I2S_DIV_MASK,
-+			   0);
-+
-+	regmap_update_bits(priv->core->aiu, AIU_CLK_CTRL_MORE,
-+			   AIU_CLK_CTRL_MORE_I2S_DIV_MASK,
-+			   AIU_CLK_CTRL_MORE_I2S_DIV(fs / 64));
-+
-+	return 0;
-+}
-+
-+static int __setup_desc(struct meson_i2s_dai *priv, unsigned int width,
-+			unsigned int channels)
-+{
-+	u32 desc = 0;
-+
-+	switch (width) {
-+	case 24:
-+		/*
-+		 * For some reason, 24 bits wide audio don't play well
-+		 * if the 32 bits mode is not set
-+		 */
-+		desc |= (AIU_I2S_SOURCE_DESC_MODE_24BIT |
-+			 AIU_I2S_SOURCE_DESC_MODE_32BIT);
-+		break;
-+	case 16:
-+		break;
-+
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	switch (channels) {
-+	case 2: /* Nothing to do */
-+		break;
-+	case 8:
-+		/* TODO: Still requires testing ... */
-+		desc |= AIU_I2S_SOURCE_DESC_MODE_8CH;
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	regmap_update_bits(priv->core->aiu, AIU_I2S_SOURCE_DESC,
-+			   AIU_I2S_SOURCE_DESC_MODE_8CH |
-+			   AIU_I2S_SOURCE_DESC_MODE_24BIT |
-+			   AIU_I2S_SOURCE_DESC_MODE_32BIT,
-+			   desc);
-+
-+	return 0;
-+}
-+
-+static int meson_i2s_dai_hw_params(struct snd_pcm_substream *substream,
-+				   struct snd_pcm_hw_params *params,
-+				   struct snd_soc_dai *dai)
-+{
-+	struct meson_i2s_dai *priv = snd_soc_dai_get_drvdata(dai);
-+	unsigned int width = params_width(params);
-+	unsigned int channels = params_channels(params);
-+	unsigned int rate = params_rate(params);
-+	int ret;
-+
-+	ret = __setup_desc(priv, width, channels);
-+	if (ret) {
-+		dev_err(dai->dev, "Unable set to set i2s description\n");
-+		return ret;
-+	}
-+
-+	ret = __bclks_set_rate(priv, rate, width);
-+	if (ret) {
-+		dev_err(dai->dev, "Unable set to the i2s clock rates\n");
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+static int meson_i2s_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
-+{
-+	struct meson_i2s_dai *priv = snd_soc_dai_get_drvdata(dai);
-+	u32 val;
-+
-+	if ((fmt & SND_SOC_DAIFMT_MASTER_MASK) != SND_SOC_DAIFMT_CBS_CFS)
-+		return -EINVAL;
-+
-+	/* DAI output mode */
-+	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
-+	case SND_SOC_DAIFMT_I2S:
-+		val = AIU_CLK_CTRL_ALRCLK_I2S;
-+		break;
-+	case SND_SOC_DAIFMT_LEFT_J:
-+		val = AIU_CLK_CTRL_ALRCLK_LEFT_J;
-+		break;
-+	case SND_SOC_DAIFMT_RIGHT_J:
-+		val = AIU_CLK_CTRL_ALRCLK_RIGHT_J;
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	regmap_update_bits(priv->core->aiu, AIU_CLK_CTRL,
-+			   AIU_CLK_CTRL_ALRCLK_SKEW_MASK,
-+			   val);
-+
-+	/* DAI clock polarity */
-+	switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
-+	case SND_SOC_DAIFMT_IB_IF:
-+		/* Invert both clocks */
-+		val = AIU_CLK_CTRL_ALRCLK_POLARITY_INVERTED |
-+			AIU_CLK_CTRL_AOCLK_POLARITY_INVERTED;
-+		break;
-+	case SND_SOC_DAIFMT_IB_NF:
-+		/* Invert bit clock */
-+		val = AIU_CLK_CTRL_ALRCLK_POLARITY_NORMAL |
-+			AIU_CLK_CTRL_AOCLK_POLARITY_INVERTED;
-+		break;
-+	case SND_SOC_DAIFMT_NB_IF:
-+		/* Invert frame clock */
-+		val = AIU_CLK_CTRL_ALRCLK_POLARITY_INVERTED |
-+			AIU_CLK_CTRL_AOCLK_POLARITY_NORMAL;
-+		break;
-+	case SND_SOC_DAIFMT_NB_NF:
-+		/* Normal clocks */
-+		val = AIU_CLK_CTRL_ALRCLK_POLARITY_NORMAL |
-+			AIU_CLK_CTRL_AOCLK_POLARITY_NORMAL;
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	regmap_update_bits(priv->core->aiu, AIU_CLK_CTRL,
-+			   AIU_CLK_CTRL_ALRCLK_POLARITY_MASK |
-+			   AIU_CLK_CTRL_AOCLK_POLARITY_MASK,
-+			   val);
-+
-+	switch (fmt & SND_SOC_DAIFMT_CLOCK_MASK) {
-+	case SND_SOC_DAIFMT_CONT:
-+		priv->bclks_idle = true;
-+		break;
-+	case SND_SOC_DAIFMT_GATED:
-+		priv->bclks_idle = false;
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
-+static int meson_i2s_dai_set_sysclk(struct snd_soc_dai *dai, int clk_id,
-+				    unsigned int freq, int dir)
-+{
-+	struct meson_i2s_dai *priv = snd_soc_dai_get_drvdata(dai);
-+	int ret;
-+
-+	if (WARN_ON(clk_id != 0))
-+		return -EINVAL;
-+
-+	if (dir == SND_SOC_CLOCK_IN)
-+		return 0;
-+
-+	ret = clk_set_rate(priv->mclk, freq);
-+	if (ret) {
-+		dev_err(dai->dev, "Failed to set sysclk to %uHz", freq);
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+static int meson_i2s_dai_startup(struct snd_pcm_substream *substream,
-+				 struct snd_soc_dai *dai)
-+{
-+	struct meson_i2s_dai *priv = snd_soc_dai_get_drvdata(dai);
-+	int ret;
-+
-+	/* Power up the i2s fast domain - can't write the registers w/o it */
-+	ret = clk_prepare_enable(priv->fast);
-+	if (ret)
-+		goto out_clk_fast;
-+
-+	/* Make sure nothing gets out of the DAI yet */
-+	__hold(priv, true);
-+
-+	/* I2S encoder needs the mixer interface gate */
-+	ret = clk_prepare_enable(priv->iface);
-+	if (ret)
-+		goto out_clk_iface;
-+
-+	/* Enable the i2s master clock */
-+	ret = clk_prepare_enable(priv->mclk);
-+	if (ret)
-+		goto out_mclk;
-+
-+	/* Enable the bit clock gate */
-+	ret = clk_prepare_enable(priv->bclks);
-+	if (ret)
-+		goto out_bclks;
-+
-+	/* Make sure the interface expect a memory layout we can work with */
-+	regmap_update_bits(priv->core->aiu, AIU_I2S_SOURCE_DESC,
-+			   AIU_I2S_SOURCE_DESC_MODE_SPLIT,
-+			   AIU_I2S_SOURCE_DESC_MODE_SPLIT);
-+
-+	return 0;
-+
-+out_bclks:
-+	clk_disable_unprepare(priv->mclk);
-+out_mclk:
-+	clk_disable_unprepare(priv->iface);
-+out_clk_iface:
-+	clk_disable_unprepare(priv->fast);
-+out_clk_fast:
-+	return ret;
-+}
-+
-+static void meson_i2s_dai_shutdown(struct snd_pcm_substream *substream,
-+				   struct snd_soc_dai *dai)
-+{
-+	struct meson_i2s_dai *priv = snd_soc_dai_get_drvdata(dai);
-+
-+	clk_disable_unprepare(priv->bclks);
-+	clk_disable_unprepare(priv->mclk);
-+	clk_disable_unprepare(priv->iface);
-+	clk_disable_unprepare(priv->fast);
-+}
-+
-+static const struct snd_soc_dai_ops meson_i2s_dai_ops = {
-+	.startup    = meson_i2s_dai_startup,
-+	.shutdown   = meson_i2s_dai_shutdown,
-+	.trigger    = meson_i2s_dai_trigger,
-+	.hw_params  = meson_i2s_dai_hw_params,
-+	.set_fmt    = meson_i2s_dai_set_fmt,
-+	.set_sysclk = meson_i2s_dai_set_sysclk,
-+};
-+
-+static struct snd_soc_dai_driver meson_i2s_dai = {
-+	.playback = {
-+		.stream_name = "Playback",
-+		.channels_min = 2,
-+		.channels_max = 8,
-+		.rates = SNDRV_PCM_RATE_8000_192000,
-+		.formats = (SNDRV_PCM_FMTBIT_S16_LE |
-+			    SNDRV_PCM_FMTBIT_S24_LE)
-+	},
-+	.ops = &meson_i2s_dai_ops,
-+};
-+
-+static const struct snd_soc_component_driver meson_i2s_dai_component = {
-+	.name	= DRV_NAME,
-+};
-+
-+static int meson_i2s_dai_probe(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct meson_i2s_dai *priv;
-+
-+	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
-+	if (!priv)
-+		return -ENOMEM;
-+
-+	platform_set_drvdata(pdev, priv);
-+	priv->core = dev_get_drvdata(dev->parent);
-+
-+	priv->fast = devm_clk_get(dev, "fast");
-+	if (IS_ERR(priv->fast)) {
-+		if (PTR_ERR(priv->fast) != -EPROBE_DEFER)
-+			dev_err(dev, "Can't get the i2s fast domain clock\n");
-+		return PTR_ERR(priv->fast);
-+	}
-+
-+	priv->iface = devm_clk_get(dev, "iface");
-+	if (IS_ERR(priv->iface)) {
-+		if (PTR_ERR(priv->iface) != -EPROBE_DEFER)
-+			dev_err(dev, "Can't get i2s dai clock gate\n");
-+		return PTR_ERR(priv->iface);
-+	}
-+
-+	priv->bclks = devm_clk_get(dev, "bclks");
-+	if (IS_ERR(priv->bclks)) {
-+		if (PTR_ERR(priv->bclks) != -EPROBE_DEFER)
-+			dev_err(dev, "Can't get bit clocks gate\n");
-+		return PTR_ERR(priv->bclks);
-+	}
-+
-+	priv->mclk = devm_clk_get(dev, "mclk");
-+	if (IS_ERR(priv->mclk)) {
-+		if (PTR_ERR(priv->mclk) != -EPROBE_DEFER)
-+			dev_err(dev, "failed to get the i2s master clock\n");
-+		return PTR_ERR(priv->mclk);
-+	}
-+
-+	return devm_snd_soc_register_component(dev, &meson_i2s_dai_component,
-+					       &meson_i2s_dai, 1);
-+}
-+
-+static const struct of_device_id meson_i2s_dai_of_match[] = {
-+	{ .compatible = "amlogic,meson-i2s-dai", },
-+	{ .compatible = "amlogic,meson-gxbb-i2s-dai", },
-+	{ .compatible = "amlogic,meson-gxl-i2s-dai", },
-+	{}
-+};
-+MODULE_DEVICE_TABLE(of, meson_i2s_dai_of_match);
-+
-+static struct platform_driver meson_i2s_dai_pdrv = {
-+	.probe = meson_i2s_dai_probe,
-+	.driver = {
-+		.name = DRV_NAME,
-+		.of_match_table = meson_i2s_dai_of_match,
-+	},
-+};
-+module_platform_driver(meson_i2s_dai_pdrv);
-+
-+MODULE_DESCRIPTION("Meson i2s DAI ASoC Driver");
-+MODULE_AUTHOR("Jerome Brunet <jbrunet@baylibre.com>");
-+MODULE_LICENSE("GPL v2");

patch/kernel/meson64-dev/0005-ASoC-meson-add-initial-spdif-support.patch

@@ -0,0 +1,721 @@
+From dfbbb017a5d763360183dd335028f29e81d69289 Mon Sep 17 00:00:00 2001
+From: Jerome Brunet <jbrunet@baylibre.com>
+Date: Thu, 30 Mar 2017 13:46:03 +0200
+Subject: [PATCH] ASoC: meson: add initial spdif support
+
+Add support for the spdif found on Amlogic Meson SoC family.
+With this initial implementation, only uncompressed pcm playback
+from the spdif dma is supported. Future work will add compressed
+support, pcm playback from i2s dma and capture.
+
+Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
+---
+ sound/soc/meson-gx/Kconfig     |   7 +
+ sound/soc/meson-gx/Makefile    |   3 +-
+ sound/soc/meson-gx/aiu-spdif.c | 669 +++++++++++++++++++++++++++++++++
+ 3 files changed, 678 insertions(+), 1 deletion(-)
+ create mode 100644 sound/soc/meson-gx/aiu-spdif.c
+
+diff --git a/sound/soc/meson-gx/Kconfig b/sound/soc/meson-gx/Kconfig
+index 8ec683cdf327..141afabfacea 100644
+--- a/sound/soc/meson-gx/Kconfig
++++ b/sound/soc/meson-gx/Kconfig
+@@ -17,3 +17,10 @@ config SND_SOC_MESON_GX_I2S
+ 	  Say Y or M if you want to add support for i2s driver for Amlogic
+ 	  Meson SoCs.
+ 
++config SND_SOC_MESON_GX_SPDIF
++	tristate "Meson spdif interface"
++	depends on SND_SOC_MESON_GX
++	select SND_PCM_IEC958
++	help
++	  Say Y or M if you want to add support for spdif driver for Amlogic
++	  Meson SoCs.
+diff --git a/sound/soc/meson-gx/Makefile b/sound/soc/meson-gx/Makefile
+index 02f9c4df6348..d37672ebe57b 100644
+--- a/sound/soc/meson-gx/Makefile
++++ b/sound/soc/meson-gx/Makefile
+@@ -1,6 +1,7 @@
+ snd-soc-meson-audio-core-objs	 := audio-core.o
+ snd-soc-meson-aiu-i2s-objs	 := aiu-i2s.o
++snd-soc-meson-aiu-spdif-objs	 := aiu-spdif.o
+ 
+ obj-$(CONFIG_SND_SOC_MESON_GX)		+= snd-soc-meson-audio-core.o
+ obj-$(CONFIG_SND_SOC_MESON_GX_I2S)	+= snd-soc-meson-aiu-i2s.o
+-
++obj-$(CONFIG_SND_SOC_MESON_GX_SPDIF)	+= snd-soc-meson-aiu-spdif.o
+diff --git a/sound/soc/meson-gx/aiu-spdif.c b/sound/soc/meson-gx/aiu-spdif.c
+new file mode 100644
+index 000000000000..17cfe134e8f7
+--- /dev/null
++++ b/sound/soc/meson-gx/aiu-spdif.c
+@@ -0,0 +1,669 @@
++/*
++ * Copyright (C) 2017 BayLibre, SAS
++ * Author: Jerome Brunet <jbrunet@baylibre.com>
++ * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <linux/clk.h>
++#include <linux/mfd/syscon.h>
++#include <linux/module.h>
++#include <linux/of.h>
++#include <linux/platform_device.h>
++#include <linux/regmap.h>
++
++#include <sound/pcm_params.h>
++#include <sound/soc.h>
++#include <sound/soc-dai.h>
++#include <sound/pcm_iec958.h>
++
++#include "aiu-regs.h"
++#include "audio-core.h"
++
++#define DRV_NAME "meson-aiu-spdif"
++
++struct meson_aiu_spdif {
++	struct meson_audio_core_data *core;
++	struct clk *iface;
++	struct clk *fast;
++	struct clk *mclk_i958;
++	struct clk *mclk;
++	int irq;
++};
++
++
++#define AIU_958_DCU_FF_CTRL_EN			BIT(0)
++#define AIU_958_DCU_FF_CTRL_AUTO_DISABLE	BIT(1)
++#define AIU_958_DCU_FF_CTRL_IRQ_MODE_MASK	GENMASK(3, 2)
++#define AIU_958_DCU_FF_CTRL_IRQ_OUT_THD		BIT(2)
++#define AIU_958_DCU_FF_CTRL_IRQ_FRAME_READ 	BIT(3)
++#define AIU_958_DCU_FF_CTRL_SYNC_HEAD_EN	BIT(4)
++#define AIU_958_DCU_FF_CTRL_BYTE_SEEK		BIT(5)
++#define AIU_958_DCU_FF_CTRL_CONTINUE		BIT(6)
++#define AIU_MEM_IEC958_BUF_CNTL_INIT		BIT(0)
++#define AIU_MEM_IEC958_CONTROL_INIT		BIT(0)
++#define AIU_MEM_IEC958_CONTROL_FILL_EN		BIT(1)
++#define AIU_MEM_IEC958_CONTROL_EMPTY_EN		BIT(2)
++#define AIU_MEM_IEC958_CONTROL_ENDIAN_MASK	GENMASK(5, 3)
++#define AIU_MEM_IEC958_CONTROL_RD_DDR		BIT(6)
++#define AIU_MEM_IEC958_CONTROL_MODE_16BIT	BIT(7)
++#define AIU_MEM_IEC958_MASKS_CH_MEM_MASK	GENMASK(15, 8)
++#define AIU_MEM_IEC958_MASKS_CH_MEM(ch)		((ch) << 8)
++#define AIU_MEM_IEC958_MASKS_CH_RD_MASK		GENMASK(7, 0)
++#define AIU_MEM_IEC958_MASKS_CH_RD(ch)		((ch) << 0)
++
++#define AIU_SPDIF_DMA_BURST 8
++#define AIU_SPDIF_BPF_MAX USHRT_MAX
++
++static struct snd_pcm_hardware meson_aiu_spdif_dma_hw = {
++	.info = (SNDRV_PCM_INFO_INTERLEAVED |
++		 SNDRV_PCM_INFO_MMAP |
++		 SNDRV_PCM_INFO_MMAP_VALID |
++		 SNDRV_PCM_INFO_PAUSE),
++
++	.formats = (SNDRV_PCM_FMTBIT_S16_LE |
++		    SNDRV_PCM_FMTBIT_S24_LE |
++		    SNDRV_PCM_FMTBIT_S32_LE),
++
++	.rates = (SNDRV_PCM_RATE_32000 |
++		  SNDRV_PCM_RATE_44100 |
++		  SNDRV_PCM_RATE_48000 |
++		  SNDRV_PCM_RATE_96000 |
++		  SNDRV_PCM_RATE_192000),
++	/*
++	 * TODO: The DMA can change the endianness, the msb position
++	 * and deal with unsigned - support this later on
++	 */
++
++	.channels_min = 2,
++	.channels_max = 2,
++	.period_bytes_min = AIU_SPDIF_DMA_BURST,
++	.period_bytes_max = AIU_SPDIF_BPF_MAX,
++	.periods_min = 2,
++	.periods_max = UINT_MAX,
++	.buffer_bytes_max = 1 * 1024 * 1024,
++	.fifo_size = 0,
++};
++
++static struct meson_aiu_spdif *meson_aiu_spdif_dma_priv(struct snd_pcm_substream *s)
++{
++	struct snd_soc_pcm_runtime *rtd = s->private_data;
++	struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);
++
++	return snd_soc_component_get_drvdata(component);
++}
++
++static snd_pcm_uframes_t
++meson_aiu_spdif_dma_pointer(struct snd_pcm_substream *substream)
++{
++	struct snd_pcm_runtime *runtime = substream->runtime;
++	struct meson_aiu_spdif *priv = meson_aiu_spdif_dma_priv(substream);
++	unsigned int addr;
++	int ret;
++
++	ret = regmap_read(priv->core->aiu, AIU_MEM_IEC958_RD_PTR,
++			  &addr);
++	if (ret)
++		return 0;
++
++	return bytes_to_frames(runtime, addr - (unsigned int)runtime->dma_addr);
++}
++
++static void __dma_enable(struct meson_aiu_spdif *priv, bool enable)
++{
++	unsigned int en_mask = (AIU_MEM_IEC958_CONTROL_FILL_EN |
++				AIU_MEM_IEC958_CONTROL_EMPTY_EN);
++
++	regmap_update_bits(priv->core->aiu, AIU_MEM_IEC958_CONTROL, en_mask,
++			   enable ? en_mask : 0);
++}
++
++static void __dcu_fifo_enable(struct meson_aiu_spdif *priv, bool enable)
++{
++	regmap_update_bits(priv->core->aiu, AIU_958_DCU_FF_CTRL,
++			   AIU_958_DCU_FF_CTRL_EN,
++			   enable ? AIU_958_DCU_FF_CTRL_EN : 0);
++}
++
++static int meson_aiu_spdif_dma_trigger(struct snd_pcm_substream *substream, int cmd)
++{
++	struct meson_aiu_spdif *priv = meson_aiu_spdif_dma_priv(substream);
++
++	switch (cmd) {
++	case SNDRV_PCM_TRIGGER_START:
++	case SNDRV_PCM_TRIGGER_RESUME:
++	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
++		__dcu_fifo_enable(priv, true);
++		__dma_enable(priv, true);
++		break;
++	case SNDRV_PCM_TRIGGER_SUSPEND:
++	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
++	case SNDRV_PCM_TRIGGER_STOP:
++		__dma_enable(priv, false);
++		__dcu_fifo_enable(priv, false);
++		break;
++	default:
++		return -EINVAL;
++	}
++
++	return 0;
++}
++
++static void __dma_init_mem(struct meson_aiu_spdif *priv)
++{
++	regmap_update_bits(priv->core->aiu, AIU_MEM_IEC958_CONTROL,
++			   AIU_MEM_IEC958_CONTROL_INIT,
++			   AIU_MEM_IEC958_CONTROL_INIT);
++	regmap_update_bits(priv->core->aiu, AIU_MEM_IEC958_BUF_CNTL,
++			   AIU_MEM_IEC958_BUF_CNTL_INIT,
++			   AIU_MEM_IEC958_BUF_CNTL_INIT);
++
++	regmap_update_bits(priv->core->aiu, AIU_MEM_IEC958_CONTROL,
++			   AIU_MEM_IEC958_CONTROL_INIT,
++			   0);
++	regmap_update_bits(priv->core->aiu, AIU_MEM_IEC958_BUF_CNTL,
++			   AIU_MEM_IEC958_BUF_CNTL_INIT,
++			   0);
++}
++
++static int meson_aiu_spdif_dma_prepare(struct snd_pcm_substream *substream)
++{
++	struct meson_aiu_spdif *priv = meson_aiu_spdif_dma_priv(substream);
++
++	__dma_init_mem(priv);
++
++	return 0;
++}
++
++static int __setup_memory_layout(struct meson_aiu_spdif *priv,
++				 unsigned int width)
++{
++	u32 mem_ctl = AIU_MEM_IEC958_CONTROL_RD_DDR;
++
++	if (width == 16)
++		mem_ctl |= AIU_MEM_IEC958_CONTROL_MODE_16BIT;
++
++	regmap_update_bits(priv->core->aiu, AIU_MEM_IEC958_CONTROL,
++			   AIU_MEM_IEC958_CONTROL_ENDIAN_MASK |
++			   AIU_MEM_IEC958_CONTROL_MODE_16BIT |
++			   AIU_MEM_IEC958_CONTROL_RD_DDR,
++			   mem_ctl);
++
++	return 0;
++}
++
++static int meson_aiu_spdif_dma_hw_params(struct snd_pcm_substream *substream,
++				   struct snd_pcm_hw_params *params)
++{
++	struct snd_pcm_runtime *runtime = substream->runtime;
++	struct meson_aiu_spdif *priv = meson_aiu_spdif_dma_priv(substream);
++	int ret;
++	dma_addr_t end_ptr;
++
++	ret = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
++	if (ret < 0)
++		return ret;
++
++	ret = __setup_memory_layout(priv, params_physical_width(params));
++	if (ret)
++		return ret;
++
++	/* Initialize memory pointers */
++	regmap_write(priv->core->aiu,
++		     AIU_MEM_IEC958_START_PTR, runtime->dma_addr);
++	regmap_write(priv->core->aiu,
++		     AIU_MEM_IEC958_RD_PTR, runtime->dma_addr);
++
++	/* The end pointer is the address of the last valid block */
++	end_ptr = runtime->dma_addr + runtime->dma_bytes - AIU_SPDIF_DMA_BURST;
++	regmap_write(priv->core->aiu, AIU_MEM_IEC958_END_PTR, end_ptr);
++
++	/* Memory masks */
++	regmap_write(priv->core->aiu, AIU_MEM_IEC958_MASKS,
++		     AIU_MEM_IEC958_MASKS_CH_RD(0xff) |
++		     AIU_MEM_IEC958_MASKS_CH_MEM(0xff));
++
++	/* Setup the number bytes read by the FIFO between each IRQ */
++	regmap_write(priv->core->aiu, AIU_958_BPF, params_period_bytes(params));
++
++	/*
++	 * AUTO_DISABLE and SYNC_HEAD are enabled by default but
++	 * this should be disabled in PCM (uncompressed) mode
++	 */
++	regmap_update_bits(priv->core->aiu, AIU_958_DCU_FF_CTRL,
++			   AIU_958_DCU_FF_CTRL_AUTO_DISABLE |
++			   AIU_958_DCU_FF_CTRL_IRQ_MODE_MASK |
++			   AIU_958_DCU_FF_CTRL_SYNC_HEAD_EN,
++			   AIU_958_DCU_FF_CTRL_IRQ_FRAME_READ);
++
++	return 0;
++}
++
++static int meson_aiu_spdif_dma_hw_free(struct snd_pcm_substream *substream)
++{
++	return snd_pcm_lib_free_pages(substream);
++}
++
++static irqreturn_t meson_aiu_spdif_dma_irq(int irq, void *dev_id)
++{
++	struct snd_pcm_substream *playback = dev_id;
++
++	snd_pcm_period_elapsed(playback);
++
++	return IRQ_HANDLED;
++}
++
++static int meson_aiu_spdif_dma_open(struct snd_pcm_substream *substream)
++{
++	struct meson_aiu_spdif *priv = meson_aiu_spdif_dma_priv(substream);
++	int ret;
++
++	snd_soc_set_runtime_hwparams(substream, &meson_aiu_spdif_dma_hw);
++
++	/*
++	 * Make sure the buffer and period size are multiple of the DMA burst
++	 * size
++	 */
++	ret = snd_pcm_hw_constraint_step(substream->runtime, 0,
++					 SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
++					 AIU_SPDIF_DMA_BURST);
++	if (ret)
++		return ret;
++
++	ret = snd_pcm_hw_constraint_step(substream->runtime, 0,
++					 SNDRV_PCM_HW_PARAM_PERIOD_BYTES,
++					 AIU_SPDIF_DMA_BURST);
++	if (ret)
++		return ret;
++
++	/* Request the SPDIF DDR irq */
++	ret = request_irq(priv->irq, meson_aiu_spdif_dma_irq, 0,
++			  DRV_NAME, substream);
++	if (ret)
++		return ret;
++
++	/* Power up the spdif fast domain - can't write the register w/o it */
++	ret = clk_prepare_enable(priv->fast);
++	if (ret)
++		return ret;
++
++	/* Make sure the dma is initially halted */
++	__dma_enable(priv, false);
++	__dcu_fifo_enable(priv, false);
++
++	return 0;
++}
++
++static int meson_aiu_spdif_dma_close(struct snd_pcm_substream *substream)
++{
++	struct meson_aiu_spdif *priv = meson_aiu_spdif_dma_priv(substream);
++
++	clk_disable_unprepare(priv->fast);
++	free_irq(priv->irq, substream);
++
++	return 0;
++}
++
++static const struct snd_pcm_ops meson_aiu_spdif_dma_ops = {
++	.open =		meson_aiu_spdif_dma_open,
++	.close =        meson_aiu_spdif_dma_close,
++	.ioctl =	snd_pcm_lib_ioctl,
++	.hw_params =	meson_aiu_spdif_dma_hw_params,
++	.hw_free =      meson_aiu_spdif_dma_hw_free,
++	.prepare =      meson_aiu_spdif_dma_prepare,
++	.pointer =	meson_aiu_spdif_dma_pointer,
++	.trigger =	meson_aiu_spdif_dma_trigger,
++};
++
++static int meson_aiu_spdif_dma_new(struct snd_soc_pcm_runtime *rtd)
++{
++	struct snd_card *card = rtd->card->snd_card;
++	size_t size = meson_aiu_spdif_dma_hw.buffer_bytes_max;
++
++	return snd_pcm_lib_preallocate_pages_for_all(rtd->pcm,
++						     SNDRV_DMA_TYPE_DEV,
++						     card->dev, size, size);
++}
++
++#define AIU_CLK_CTRL_958_DIV_EN			BIT(1)
++#define AIU_CLK_CTRL_958_DIV_MASK		GENMASK(5, 4)
++#define AIU_CLK_CTRL_958_DIV_MORE		BIT(12)
++#define AIU_MEM_IEC958_CONTROL_MODE_LINEAR	BIT(8)
++#define AIU_958_CTRL_HOLD_EN			BIT(0)
++#define AIU_958_MISC_NON_PCM			BIT(0)
++#define AIU_958_MISC_MODE_16BITS		BIT(1)
++#define AIU_958_MISC_16BITS_ALIGN_MASK		GENMASK(6, 5)
++#define AIU_958_MISC_16BITS_ALIGN(val)		((val) << 5)
++#define AIU_958_MISC_MODE_32BITS		BIT(7)
++#define AIU_958_MISC_32BITS_SHIFT_MASK		GENMASK(10, 8)
++#define AIU_958_MISC_32BITS_SHIFT(val)		((val) << 8)
++#define AIU_958_MISC_U_FROM_STREAM		BIT(12)
++#define AIU_958_MISC_FORCE_LR			BIT(13)
++
++#define AIU_CS_WORD_LEN 4
++
++static void __hold(struct meson_aiu_spdif *priv, bool enable)
++{
++	regmap_update_bits(priv->core->aiu, AIU_958_CTRL,
++			   AIU_958_CTRL_HOLD_EN,
++			   enable ? AIU_958_CTRL_HOLD_EN : 0);
++}
++
++static void __divider_enable(struct meson_aiu_spdif *priv, bool enable)
++{
++	regmap_update_bits(priv->core->aiu, AIU_CLK_CTRL,
++			   AIU_CLK_CTRL_958_DIV_EN,
++			   enable ? AIU_CLK_CTRL_958_DIV_EN : 0);
++}
++
++static void __playback_start(struct meson_aiu_spdif *priv)
++{
++	__divider_enable(priv, true);
++	__hold(priv, false);
++}
++
++static void __playback_stop(struct meson_aiu_spdif *priv)
++{
++	__hold(priv, true);
++	__divider_enable(priv, false);
++}
++
++static int meson_aiu_spdif_dai_trigger(struct snd_pcm_substream *substream, int cmd,
++				   struct snd_soc_dai *dai)
++{
++	struct meson_aiu_spdif *priv = snd_soc_dai_get_drvdata(dai);
++
++	switch (cmd) {
++	case SNDRV_PCM_TRIGGER_START:
++	case SNDRV_PCM_TRIGGER_RESUME:
++	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
++		__playback_start(priv);
++		return 0;
++
++	case SNDRV_PCM_TRIGGER_STOP:
++	case SNDRV_PCM_TRIGGER_SUSPEND:
++	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
++		__playback_stop(priv);
++		return 0;
++
++	default:
++		return -EINVAL;
++	}
++}
++
++static int __setup_spdif_clk(struct meson_aiu_spdif *priv, unsigned int rate)
++{
++	unsigned int mrate;
++
++	/* Leave the internal divisor alone */
++	regmap_update_bits(priv->core->aiu, AIU_CLK_CTRL,
++			   AIU_CLK_CTRL_958_DIV_MASK |
++			   AIU_CLK_CTRL_958_DIV_MORE,
++			   0);
++
++	/* 2 * 32bits per subframe * 2 channels = 128 */
++	mrate = rate * 128;
++	return clk_set_rate(priv->mclk, mrate);
++}
++
++static int __setup_cs_word(struct meson_aiu_spdif *priv,
++			   struct snd_pcm_hw_params *params)
++{
++	u8 cs[AIU_CS_WORD_LEN];
++	u32 val;
++	int ret;
++
++	ret = snd_pcm_create_iec958_consumer_hw_params(params, cs,
++						       AIU_CS_WORD_LEN);
++	if (ret < 0)
++		return -EINVAL;
++
++	/* Write the 1st half word */
++	val = cs[1] | cs[0] << 8;
++	regmap_write(priv->core->aiu, AIU_958_CHSTAT_L0, val);
++	regmap_write(priv->core->aiu, AIU_958_CHSTAT_R0, val);
++
++	/* Write the 2nd half word */
++	val = cs[3] | cs[2] << 8;
++	regmap_write(priv->core->aiu, AIU_958_CHSTAT_L1, val);
++	regmap_write(priv->core->aiu, AIU_958_CHSTAT_R1, val);
++
++	return 0;
++}
++
++static int __setup_pcm_fmt(struct meson_aiu_spdif *priv,
++			   unsigned int width)
++{
++	u32 val = 0;
++
++	switch (width) {
++	case 16:
++		val |= AIU_958_MISC_MODE_16BITS;
++		val |= AIU_958_MISC_16BITS_ALIGN(2);
++		break;
++	case 32:
++	case 24:
++		/*
++		 * Looks like this should only be set for 32bits mode, but the
++		 * vendor kernel sets it like this for 24bits as well, let's
++		 * try and see
++		 */
++		val |= AIU_958_MISC_MODE_32BITS;
++		break;
++	default:
++		return -EINVAL;
++	}
++
++	/* No idea what this actually does, copying the vendor kernel for now */
++	val |= AIU_958_MISC_FORCE_LR;
++	val |= AIU_958_MISC_U_FROM_STREAM;
++
++	regmap_update_bits(priv->core->aiu, AIU_958_MISC,
++			   AIU_958_MISC_NON_PCM |
++			   AIU_958_MISC_MODE_16BITS |
++			   AIU_958_MISC_16BITS_ALIGN_MASK |
++			   AIU_958_MISC_MODE_32BITS |
++			   AIU_958_MISC_FORCE_LR,
++			   val);
++
++	return 0;
++}
++
++static int meson_aiu_spdif_dai_hw_params(struct snd_pcm_substream *substream,
++				     struct snd_pcm_hw_params *params,
++				     struct snd_soc_dai *dai)
++{
++	struct meson_aiu_spdif *priv = snd_soc_dai_get_drvdata(dai);
++	int ret;
++
++	ret = __setup_spdif_clk(priv, params_rate(params));
++	if (ret) {
++		dev_err(dai->dev, "Unable to set the spdif clock\n");
++		return ret;
++	}
++
++	ret = __setup_cs_word(priv, params);
++	if (ret) {
++		dev_err(dai->dev, "Unable to set the channel status word\n");
++		return ret;
++	}
++
++	ret = __setup_pcm_fmt(priv, params_width(params));
++	if (ret) {
++		dev_err(dai->dev, "Unable to set the pcm format\n");
++		return ret;
++	}
++
++	return 0;
++}
++
++static int meson_aiu_spdif_dai_startup(struct snd_pcm_substream *substream,
++				   struct snd_soc_dai *dai)
++{
++	struct meson_aiu_spdif *priv = snd_soc_dai_get_drvdata(dai);
++	int ret;
++
++	/* Power up the spdif fast domain - can't write the registers w/o it */
++	ret = clk_prepare_enable(priv->fast);
++	if (ret)
++		goto out_clk_fast;
++
++	/* Make sure nothing gets out of the DAI yet*/
++	__hold(priv, true);
++
++	ret = clk_set_parent(priv->mclk, priv->mclk_i958);
++	if (ret)
++		return ret;
++
++	/* Enable the clock gate */
++	ret = clk_prepare_enable(priv->iface);
++	if (ret)
++		goto out_clk_iface;
++
++	/* Enable the spdif clock */
++	ret = clk_prepare_enable(priv->mclk);
++	if (ret)
++		goto out_mclk;
++
++	/*
++	 * Make sure the interface expect a memory layout we can work with
++	 * MEM prefixed register usually belong to the DMA, but when the spdif
++	 * DAI takes data from the i2s buffer, we need to make sure it works in
++	 * split mode and not the  "normal mode" (channel samples packed in
++	 * 32 bytes groups)
++	 */
++	regmap_update_bits(priv->core->aiu, AIU_MEM_IEC958_CONTROL,
++			   AIU_MEM_IEC958_CONTROL_MODE_LINEAR,
++			   AIU_MEM_IEC958_CONTROL_MODE_LINEAR);
++
++	return 0;
++
++out_mclk:
++	clk_disable_unprepare(priv->iface);
++out_clk_iface:
++	clk_disable_unprepare(priv->fast);
++out_clk_fast:
++	return ret;
++}
++
++static void meson_aiu_spdif_dai_shutdown(struct snd_pcm_substream *substream,
++				   struct snd_soc_dai *dai)
++{
++	struct meson_aiu_spdif *priv = snd_soc_dai_get_drvdata(dai);
++
++	clk_disable_unprepare(priv->iface);
++	clk_disable_unprepare(priv->mclk);
++	clk_disable_unprepare(priv->fast);
++}
++
++static const struct snd_soc_dai_ops meson_aiu_spdif_dai_ops = {
++	.startup    = meson_aiu_spdif_dai_startup,
++	.shutdown   = meson_aiu_spdif_dai_shutdown,
++	.trigger    = meson_aiu_spdif_dai_trigger,
++	.hw_params  = meson_aiu_spdif_dai_hw_params,
++};
++
++static struct snd_soc_dai_driver meson_aiu_spdif_dai = {
++	.playback = {
++		.stream_name = "Playback",
++		.channels_min = 2,
++		.channels_max = 2,
++		.rates = (SNDRV_PCM_RATE_32000 |
++			  SNDRV_PCM_RATE_44100 |
++			  SNDRV_PCM_RATE_48000 |
++			  SNDRV_PCM_RATE_96000 |
++			  SNDRV_PCM_RATE_192000),
++		.formats = (SNDRV_PCM_FMTBIT_S16_LE |
++			    SNDRV_PCM_FMTBIT_S24_LE)
++	},
++	.ops = &meson_aiu_spdif_dai_ops,
++};
++
++static const struct snd_soc_component_driver meson_aiu_spdif_component = {
++	.ops		= &meson_aiu_spdif_dma_ops,
++	.pcm_new	= meson_aiu_spdif_dma_new,
++	.name	= DRV_NAME,
++};
++
++static int meson_aiu_spdif_probe(struct platform_device *pdev)
++{
++	struct device *dev = &pdev->dev;
++	struct meson_aiu_spdif *priv;
++
++	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
++	if (!priv)
++		return -ENOMEM;
++
++	platform_set_drvdata(pdev, priv);
++	priv->core = dev_get_drvdata(dev->parent);
++
++	priv->fast = devm_clk_get(dev, "fast");
++	if (IS_ERR(priv->fast)) {
++		if (PTR_ERR(priv->fast) != -EPROBE_DEFER)
++			dev_err(dev, "Can't get spdif fast domain clockt\n");
++		return PTR_ERR(priv->fast);
++	}
++
++	priv->iface = devm_clk_get(dev, "iface");
++	if (IS_ERR(priv->iface)) {
++		if (PTR_ERR(priv->iface) != -EPROBE_DEFER)
++			dev_err(dev,
++				"Can't get the dai clock gate\n");
++		return PTR_ERR(priv->iface);
++	}
++
++	priv->mclk_i958 = devm_clk_get(dev, "mclk_i958");
++	if (IS_ERR(priv->mclk_i958)) {
++		if (PTR_ERR(priv->mclk_i958) != -EPROBE_DEFER)
++			dev_err(dev, "Can't get the spdif master clock\n");
++		return PTR_ERR(priv->mclk_i958);
++	}
++
++	/*
++	 * TODO: the spdif dai can also get its data from the i2s fifo.
++	 * For this use-case, the DAI driver will need to get the i2s master
++	 * clock in order to reparent the spdif clock from cts_mclk_i958 to
++	 * cts_amclk
++	 */
++
++	priv->mclk = devm_clk_get(dev, "mclk");
++	if (IS_ERR(priv->mclk)) {
++		if (PTR_ERR(priv->mclk) != -EPROBE_DEFER)
++			dev_err(dev, "Can't get the spdif input mux clock\n");
++		return PTR_ERR(priv->mclk);
++	}
++
++	return devm_snd_soc_register_component(dev, &meson_aiu_spdif_component,
++					       &meson_aiu_spdif_dai, 1);
++}
++
++static const struct of_device_id meson_aiu_spdif_of_match[] = {
++	{ .compatible = "amlogic,meson-aiu-spdif", },
++	{}
++};
++MODULE_DEVICE_TABLE(of, meson_aiu_spdif_of_match);
++
++static struct platform_driver meson_aiu_spdif_pdrv = {
++	.probe = meson_aiu_spdif_probe,
++	.driver = {
++		.name = DRV_NAME,
++		.of_match_table = meson_aiu_spdif_of_match,
++	},
++};
++module_platform_driver(meson_aiu_spdif_pdrv);
++
++MODULE_DESCRIPTION("Meson AIU spdif ASoC Driver");
++MODULE_AUTHOR("Jerome Brunet <jbrunet@baylibre.com>");
++MODULE_LICENSE("GPL v2");

patch/kernel/meson64-dev/0006-ARM64-defconfig-enable-audio-support-for-meson-SoCs-.patch

@@ -0,0 +1,28 @@
+From c1f86be546158d867db8d893d7ec24799f9b05a4 Mon Sep 17 00:00:00 2001
+From: Jerome Brunet <jbrunet@baylibre.com>
+Date: Fri, 31 Mar 2017 15:55:03 +0200
+Subject: [PATCH] ARM64: defconfig: enable audio support for meson SoCs as
+ module
+
+Add audio support for meson SoCs. This includes the audio core
+driver and the i2s and spdif output interfaces
+
+Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
+---
+ arch/arm64/configs/defconfig | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
+index c65bf96aff06..350e85866ed4 100644
+--- a/arch/arm64/configs/defconfig
++++ b/arch/arm64/configs/defconfig
+@@ -479,6 +479,9 @@ CONFIG_SOUND=y
+ CONFIG_SND=y
+ CONFIG_SND_SOC=y
+ CONFIG_SND_BCM2835_SOC_I2S=m
++CONFIG_SND_SOC_MESON_GX=m
++CONFIG_SND_SOC_MESON_GX_I2S=m
++CONFIG_SND_SOC_MESON_GX_SPDIF=m
+ CONFIG_SND_SOC_ROCKCHIP=m
+ CONFIG_SND_SOC_ROCKCHIP_I2S=m
+ CONFIG_SND_SOC_ROCKCHIP_SPDIF=m

patch/kernel/meson64-dev/0006-ASoC-meson-add-aiu-spdif-dma-support.patch

@@ -1,443 +0,0 @@
-From 32a55958cc2d89e2feee831ca4e6ceae8458e950 Mon Sep 17 00:00:00 2001
-From: Jerome Brunet <jbrunet@baylibre.com>
-Date: Thu, 30 Mar 2017 13:43:52 +0200
-Subject: [PATCH] ASoC: meson: add aiu spdif dma support
-
-Add support for the spdif output dma which is part of the AIU block
-
-Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
-
----
- sound/soc/meson/Kconfig         |   7 +
- sound/soc/meson/Makefile        |   4 +-
- sound/soc/meson/aiu-spdif-dma.c | 388 ++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 398 insertions(+), 1 deletion(-)
- create mode 100644 sound/soc/meson/aiu-spdif-dma.c
-
-diff --git a/sound/soc/meson/Kconfig b/sound/soc/meson/Kconfig
-index 5904e9e..712303f 100644
---- a/sound/soc/meson/Kconfig
-+++ b/sound/soc/meson/Kconfig
-@@ -80,3 +80,10 @@ config SND_SOC_MESON_I2S
- 	help
- 	  Say Y or M if you want to add support for i2s driver for Amlogic
- 	  Meson SoCs.
-+
-+config SND_SOC_MESON_SPDIF
-+	tristate "Meson spdif interface"
-+	depends on SND_SOC_MESON
-+	help
-+	  Say Y or M if you want to add support for spdif dma driver for Amlogic
-+	  Meson SoCs.
-diff --git a/sound/soc/meson/Makefile b/sound/soc/meson/Makefile
-index b8641f9..dc5164a7 100644
---- a/sound/soc/meson/Makefile
-+++ b/sound/soc/meson/Makefile
-@@ -22,8 +22,10 @@ obj-$(CONFIG_SND_MESON_AXG_SPDIFOUT) += snd-soc-meson-axg-spdifout.o
- 
- snd-soc-meson-audio-core-objs	 := audio-core.o
- snd-soc-meson-aiu-i2s-dma-objs	 := aiu-i2s-dma.o
-+snd-soc-meson-aiu-spdif-dma-objs := aiu-spdif-dma.o
- snd-soc-meson-i2s-dai-objs	 := i2s-dai.o
- 
- obj-$(CONFIG_SND_SOC_MESON) += snd-soc-meson-audio-core.o
- obj-$(CONFIG_SND_SOC_MESON_I2S)	+= snd-soc-meson-aiu-i2s-dma.o
--obj-$(CONFIG_SND_SOC_MESON_I2S)	+= snd-soc-meson-i2s-dai.o
-\ No newline at end of file
-+obj-$(CONFIG_SND_SOC_MESON_I2S)	+= snd-soc-meson-i2s-dai.o
-+obj-$(CONFIG_SND_SOC_MESON_SPDIF) += snd-soc-meson-aiu-spdif-dma.o
-\ No newline at end of file
-diff --git a/sound/soc/meson/aiu-spdif-dma.c b/sound/soc/meson/aiu-spdif-dma.c
-new file mode 100644
-index 0000000..81c3b85
---- /dev/null
-+++ b/sound/soc/meson/aiu-spdif-dma.c
-@@ -0,0 +1,388 @@
-+/*
-+ * Copyright (C) 2017 BayLibre, SAS
-+ * Author: Jerome Brunet <jbrunet@baylibre.com>
-+ * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of the
-+ * License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <linux/clk.h>
-+#include <linux/mfd/syscon.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/platform_device.h>
-+#include <linux/regmap.h>
-+
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+
-+#include "aiu-regs.h"
-+#include "audio-core.h"
-+
-+#define DRV_NAME "meson-aiu-spdif-dma"
-+
-+struct aiu_spdif_dma {
-+	struct meson_audio_core_data *core;
-+	struct clk *fast;
-+	int irq;
-+};
-+
-+#define AIU_958_DCU_FF_CTRL_EN			BIT(0)
-+#define AIU_958_DCU_FF_CTRL_AUTO_DISABLE	BIT(1)
-+#define AIU_958_DCU_FF_CTRL_IRQ_MODE_MASK	GENMASK(3, 2)
-+#define AIU_958_DCU_FF_CTRL_IRQ_OUT_THD		BIT(2)
-+#define AIU_958_DCU_FF_CTRL_IRQ_FRAME_READ 	BIT(3)
-+#define AIU_958_DCU_FF_CTRL_SYNC_HEAD_EN	BIT(4)
-+#define AIU_958_DCU_FF_CTRL_BYTE_SEEK		BIT(5)
-+#define AIU_958_DCU_FF_CTRL_CONTINUE		BIT(6)
-+#define AIU_MEM_IEC958_BUF_CNTL_INIT		BIT(0)
-+#define AIU_MEM_IEC958_CONTROL_INIT		BIT(0)
-+#define AIU_MEM_IEC958_CONTROL_FILL_EN		BIT(1)
-+#define AIU_MEM_IEC958_CONTROL_EMPTY_EN		BIT(2)
-+#define AIU_MEM_IEC958_CONTROL_ENDIAN_MASK	GENMASK(5, 3)
-+#define AIU_MEM_IEC958_CONTROL_RD_DDR		BIT(6)
-+#define AIU_MEM_IEC958_CONTROL_MODE_16BIT	BIT(7)
-+#define AIU_MEM_IEC958_MASKS_CH_MEM_MASK	GENMASK(15, 8)
-+#define AIU_MEM_IEC958_MASKS_CH_MEM(ch)		((ch) << 8)
-+#define AIU_MEM_IEC958_MASKS_CH_RD_MASK		GENMASK(7, 0)
-+#define AIU_MEM_IEC958_MASKS_CH_RD(ch)		((ch) << 0)
-+
-+#define AIU_SPDIF_DMA_BURST 8
-+#define AIU_SPDIF_BPF_MAX USHRT_MAX
-+
-+static struct snd_pcm_hardware aiu_spdif_dma_hw = {
-+	.info = (SNDRV_PCM_INFO_INTERLEAVED |
-+		 SNDRV_PCM_INFO_MMAP |
-+		 SNDRV_PCM_INFO_MMAP_VALID |
-+		 SNDRV_PCM_INFO_PAUSE),
-+
-+	.formats = (SNDRV_PCM_FMTBIT_S16_LE |
-+		    SNDRV_PCM_FMTBIT_S24_LE |
-+		    SNDRV_PCM_FMTBIT_S32_LE),
-+
-+	.rates = (SNDRV_PCM_RATE_32000 |
-+		  SNDRV_PCM_RATE_44100 |
-+		  SNDRV_PCM_RATE_48000 |
-+		  SNDRV_PCM_RATE_96000 |
-+		  SNDRV_PCM_RATE_192000),
-+	/*
-+	 * TODO: The DMA can change the endianness, the msb position
-+	 * and deal with unsigned - support this later on
-+	 */
-+
-+	.channels_min = 2,
-+	.channels_max = 2,
-+	.period_bytes_min = AIU_SPDIF_DMA_BURST,
-+	.period_bytes_max = AIU_SPDIF_BPF_MAX,
-+	.periods_min = 2,
-+	.periods_max = UINT_MAX,
-+	.buffer_bytes_max = 1 * 1024 * 1024,
-+	.fifo_size = 0,
-+};
-+
-+static struct aiu_spdif_dma *aiu_spdif_dma_priv(struct snd_pcm_substream *s)
-+{
-+	struct snd_soc_pcm_runtime *rtd = s->private_data;
-+	struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);
-+
-+	return snd_soc_component_get_drvdata(component);
-+}
-+
-+static snd_pcm_uframes_t
-+aiu_spdif_dma_pointer(struct snd_pcm_substream *substream)
-+{
-+	struct snd_pcm_runtime *runtime = substream->runtime;
-+	struct aiu_spdif_dma *priv = aiu_spdif_dma_priv(substream);
-+	unsigned int addr;
-+	int ret;
-+
-+	ret = regmap_read(priv->core->aiu, AIU_MEM_IEC958_RD_PTR,
-+			  &addr);
-+	if (ret)
-+		return 0;
-+
-+	return bytes_to_frames(runtime, addr - (unsigned int)runtime->dma_addr);
-+}
-+
-+static void __dma_enable(struct aiu_spdif_dma *priv, bool enable)
-+{
-+	unsigned int en_mask = (AIU_MEM_IEC958_CONTROL_FILL_EN |
-+				AIU_MEM_IEC958_CONTROL_EMPTY_EN);
-+
-+	regmap_update_bits(priv->core->aiu, AIU_MEM_IEC958_CONTROL, en_mask,
-+			   enable ? en_mask : 0);
-+}
-+
-+static void __dcu_fifo_enable(struct aiu_spdif_dma *priv, bool enable)
-+{
-+	regmap_update_bits(priv->core->aiu, AIU_958_DCU_FF_CTRL,
-+			   AIU_958_DCU_FF_CTRL_EN,
-+			   enable ? AIU_958_DCU_FF_CTRL_EN : 0);
-+}
-+
-+static int aiu_spdif_dma_trigger(struct snd_pcm_substream *substream, int cmd)
-+{
-+	struct aiu_spdif_dma *priv = aiu_spdif_dma_priv(substream);
-+
-+	switch (cmd) {
-+	case SNDRV_PCM_TRIGGER_START:
-+	case SNDRV_PCM_TRIGGER_RESUME:
-+	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-+		__dcu_fifo_enable(priv, true);
-+		__dma_enable(priv, true);
-+		break;
-+	case SNDRV_PCM_TRIGGER_SUSPEND:
-+	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-+	case SNDRV_PCM_TRIGGER_STOP:
-+		__dma_enable(priv, false);
-+		__dcu_fifo_enable(priv, false);
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
-+static void __dma_init_mem(struct aiu_spdif_dma *priv)
-+{
-+	regmap_update_bits(priv->core->aiu, AIU_MEM_IEC958_CONTROL,
-+			   AIU_MEM_IEC958_CONTROL_INIT,
-+			   AIU_MEM_IEC958_CONTROL_INIT);
-+	regmap_update_bits(priv->core->aiu, AIU_MEM_IEC958_BUF_CNTL,
-+			   AIU_MEM_IEC958_BUF_CNTL_INIT,
-+			   AIU_MEM_IEC958_BUF_CNTL_INIT);
-+
-+	regmap_update_bits(priv->core->aiu, AIU_MEM_IEC958_CONTROL,
-+			   AIU_MEM_IEC958_CONTROL_INIT,
-+			   0);
-+	regmap_update_bits(priv->core->aiu, AIU_MEM_IEC958_BUF_CNTL,
-+			   AIU_MEM_IEC958_BUF_CNTL_INIT,
-+			   0);
-+}
-+
-+static int aiu_spdif_dma_prepare(struct snd_pcm_substream *substream)
-+{
-+	struct aiu_spdif_dma *priv = aiu_spdif_dma_priv(substream);
-+
-+	__dma_init_mem(priv);
-+
-+	return 0;
-+}
-+
-+static int __setup_memory_layout(struct aiu_spdif_dma *priv,
-+				 unsigned int width)
-+{
-+	u32 mem_ctl = AIU_MEM_IEC958_CONTROL_RD_DDR;
-+
-+	if (width == 16)
-+		mem_ctl |= AIU_MEM_IEC958_CONTROL_MODE_16BIT;
-+
-+	regmap_update_bits(priv->core->aiu, AIU_MEM_IEC958_CONTROL,
-+			   AIU_MEM_IEC958_CONTROL_ENDIAN_MASK |
-+			   AIU_MEM_IEC958_CONTROL_MODE_16BIT |
-+			   AIU_MEM_IEC958_CONTROL_RD_DDR,
-+			   mem_ctl);
-+
-+	return 0;
-+}
-+
-+static int aiu_spdif_dma_hw_params(struct snd_pcm_substream *substream,
-+				   struct snd_pcm_hw_params *params)
-+{
-+	struct snd_pcm_runtime *runtime = substream->runtime;
-+	struct aiu_spdif_dma *priv = aiu_spdif_dma_priv(substream);
-+	int ret;
-+	dma_addr_t end_ptr;
-+
-+	ret = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
-+	if (ret < 0)
-+		return ret;
-+
-+	ret = __setup_memory_layout(priv, params_physical_width(params));
-+	if (ret)
-+		return ret;
-+
-+	/* Initialize memory pointers */
-+	regmap_write(priv->core->aiu,
-+		     AIU_MEM_IEC958_START_PTR, runtime->dma_addr);
-+	regmap_write(priv->core->aiu,
-+		     AIU_MEM_IEC958_RD_PTR, runtime->dma_addr);
-+
-+	/* The end pointer is the address of the last valid block */
-+	end_ptr = runtime->dma_addr + runtime->dma_bytes - AIU_SPDIF_DMA_BURST;
-+	regmap_write(priv->core->aiu, AIU_MEM_IEC958_END_PTR, end_ptr);
-+
-+	/* Memory masks */
-+	regmap_write(priv->core->aiu, AIU_MEM_IEC958_MASKS,
-+		     AIU_MEM_IEC958_MASKS_CH_RD(0xff) |
-+		     AIU_MEM_IEC958_MASKS_CH_MEM(0xff));
-+
-+	/* Setup the number bytes read by the FIFO between each IRQ */
-+	regmap_write(priv->core->aiu, AIU_958_BPF, params_period_bytes(params));
-+
-+	/*
-+	 * AUTO_DISABLE and SYNC_HEAD are enabled by default but
-+	 * this should be disabled in PCM (uncompressed) mode
-+	 */
-+	regmap_update_bits(priv->core->aiu, AIU_958_DCU_FF_CTRL,
-+			   AIU_958_DCU_FF_CTRL_AUTO_DISABLE |
-+			   AIU_958_DCU_FF_CTRL_IRQ_MODE_MASK |
-+			   AIU_958_DCU_FF_CTRL_SYNC_HEAD_EN,
-+			   AIU_958_DCU_FF_CTRL_IRQ_FRAME_READ);
-+
-+	return 0;
-+}
-+
-+static int aiu_spdif_dma_hw_free(struct snd_pcm_substream *substream)
-+{
-+	return snd_pcm_lib_free_pages(substream);
-+}
-+
-+static irqreturn_t aiu_spdif_dma_irq(int irq, void *dev_id)
-+{
-+	struct snd_pcm_substream *playback = dev_id;
-+
-+	snd_pcm_period_elapsed(playback);
-+
-+	return IRQ_HANDLED;
-+}
-+
-+static int aiu_spdif_dma_open(struct snd_pcm_substream *substream)
-+{
-+	struct aiu_spdif_dma *priv = aiu_spdif_dma_priv(substream);
-+	int ret;
-+
-+	snd_soc_set_runtime_hwparams(substream, &aiu_spdif_dma_hw);
-+
-+	/*
-+	 * Make sure the buffer and period size are multiple of the DMA burst
-+	 * size
-+	 */
-+	ret = snd_pcm_hw_constraint_step(substream->runtime, 0,
-+					 SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
-+					 AIU_SPDIF_DMA_BURST);
-+	if (ret)
-+		return ret;
-+
-+	ret = snd_pcm_hw_constraint_step(substream->runtime, 0,
-+					 SNDRV_PCM_HW_PARAM_PERIOD_BYTES,
-+					 AIU_SPDIF_DMA_BURST);
-+	if (ret)
-+		return ret;
-+
-+	/* Request the SPDIF DDR irq */
-+	ret = request_irq(priv->irq, aiu_spdif_dma_irq, 0,
-+			  DRV_NAME, substream);
-+	if (ret)
-+		return ret;
-+
-+	/* Power up the spdif fast domain - can't write the register w/o it */
-+	ret = clk_prepare_enable(priv->fast);
-+	if (ret)
-+		return ret;
-+
-+	/* Make sure the dma is initially halted */
-+	__dma_enable(priv, false);
-+	__dcu_fifo_enable(priv, false);
-+
-+	return 0;
-+}
-+
-+static int aiu_spdif_dma_close(struct snd_pcm_substream *substream)
-+{
-+	struct aiu_spdif_dma *priv = aiu_spdif_dma_priv(substream);
-+
-+	clk_disable_unprepare(priv->fast);
-+	free_irq(priv->irq, substream);
-+
-+	return 0;
-+}
-+
-+static const struct snd_pcm_ops aiu_spdif_dma_ops = {
-+	.open =		aiu_spdif_dma_open,
-+	.close =        aiu_spdif_dma_close,
-+	.ioctl =	snd_pcm_lib_ioctl,
-+	.hw_params =	aiu_spdif_dma_hw_params,
-+	.hw_free =      aiu_spdif_dma_hw_free,
-+	.prepare =      aiu_spdif_dma_prepare,
-+	.pointer =	aiu_spdif_dma_pointer,
-+	.trigger =	aiu_spdif_dma_trigger,
-+};
-+
-+static int aiu_spdif_dma_new(struct snd_soc_pcm_runtime *rtd)
-+{
-+	struct snd_card *card = rtd->card->snd_card;
-+	size_t size = aiu_spdif_dma_hw.buffer_bytes_max;
-+
-+	return snd_pcm_lib_preallocate_pages_for_all(rtd->pcm,
-+						     SNDRV_DMA_TYPE_DEV,
-+						     card->dev, size, size);
-+}
-+
-+static const struct snd_soc_component_driver aiu_spdif_platform = {
-+	.ops		= &aiu_spdif_dma_ops,
-+	.pcm_new	= aiu_spdif_dma_new,
-+	.name 		= DRV_NAME,
-+};
-+
-+static int aiu_spdif_dma_probe(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct aiu_spdif_dma *priv;
-+
-+	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
-+	if (!priv)
-+		return -ENOMEM;
-+
-+	platform_set_drvdata(pdev, priv);
-+	priv->core = dev_get_drvdata(dev->parent);
-+
-+	priv->fast = devm_clk_get(dev, "fast");
-+	if (IS_ERR(priv->fast)) {
-+		if (PTR_ERR(priv->fast) != -EPROBE_DEFER)
-+			dev_err(dev, "Can't get spdif fast domain clock\n");
-+		return PTR_ERR(priv->fast);
-+	}
-+
-+	priv->irq = platform_get_irq(pdev, 0);
-+	if (priv->irq <= 0) {
-+		dev_err(dev, "Can't get spdif ddr irq\n");
-+		return priv->irq;
-+	}
-+
-+	return devm_snd_soc_register_component(dev, &aiu_spdif_platform,
-+					       NULL, 0);
-+}
-+
-+static const struct of_device_id aiu_spdif_dma_of_match[] = {
-+	{ .compatible = "amlogic,meson-aiu-spdif-dma", },
-+	{ .compatible = "amlogic,meson-gxbb-aiu-spdif-dma", },
-+	{ .compatible = "amlogic,meson-gxl-aiu-spdif-dma", },
-+	{}
-+};
-+MODULE_DEVICE_TABLE(of, aiu_spdif_dma_of_match);
-+
-+static struct platform_driver aiu_spdif_dma_pdrv = {
-+	.probe = aiu_spdif_dma_probe,
-+	.driver = {
-+		.name = DRV_NAME,
-+		.of_match_table = aiu_spdif_dma_of_match,
-+	},
-+};
-+module_platform_driver(aiu_spdif_dma_pdrv);
-+
-+MODULE_DESCRIPTION("Meson AIU spdif DMA ASoC Driver");
-+MODULE_AUTHOR("Jerome Brunet <jbrunet@baylibre.com>");
-+MODULE_LICENSE("GPL");

patch/kernel/meson64-dev/0007-ARM64-dts-meson-gx-add-audio-controller-nodes.patch

@@ -1,74 +1,60 @@
-From 7ecd280bd317cff3c608b32b2a185929b2ec17ca Mon Sep 17 00:00:00 2001
+From ce42cfc82f47d90515d11c985063d6a535bfd9d7 Mon Sep 17 00:00:00 2001
 From: Jerome Brunet <jbrunet@baylibre.com>
 Date: Thu, 30 Mar 2017 15:19:04 +0200
 Subject: [PATCH] ARM64: dts: meson-gx: add audio controller nodes
 
 Add audio controller nodes for Amlogic meson gxbb and gxl.
-This includes the audio-core node, the i2s and spdif DAIs, i2s and spdif
-aiu DMAs.
+This includes the audio-core node, the i2s and spdif DAIs
 
 Audio on this SoC family is still a work in progress. More nodes are likely
 to be added later on (pcm DAIs, input DMAs, etc ...)
 
 Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
-
 ---
- arch/arm64/boot/dts/amlogic/meson-gx.dtsi   | 35 ++++++++++++++++++++++++++
- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 39 +++++++++++++++++++++++++++++
- arch/arm64/boot/dts/amlogic/meson-gxl.dtsi  | 38 ++++++++++++++++++++++++++++
- 3 files changed, 112 insertions(+)
+ arch/arm64/boot/dts/amlogic/meson-gx.dtsi   | 23 +++++++++++++++++
+ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 28 +++++++++++++++++++++
+ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi  | 28 +++++++++++++++++++++
+ 3 files changed, 79 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
-index b8dc4db..6b64b63 100644
+index f1e5cdbade5e..bcef1d2f6367 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
-@@ -203,6 +203,41 @@
+@@ -203,6 +203,29 @@
  				#reset-cells = <1>;
  			};
  
 +			audio: audio@5400 {
-+				compatible = "amlogic,meson-audio-core";
++				compatible = "amlogic,meson-gx-audio-core";
 +				reg = <0x0 0x5400 0x0 0x2ac>,
 +				      <0x0 0xa000 0x0 0x304>;
 +				reg-names = "aiu", "audin";
 +				status = "disabled";
 +
-+				aiu_i2s_dma: aiu_i2s_dma {
++				aiu_i2s: audio-controller-0 {
 +					#sound-dai-cells = <0>;
-+					compatible = "amlogic,meson-aiu-i2s-dma";
++					compatible = "amlogic,meson-aiu-i2s";
 +					interrupts = <GIC_SPI 48 IRQ_TYPE_EDGE_RISING>;
 +					status = "disabled";
 +				};
 +
-+				aiu_spdif_dma: aiu_spdif_dma {
++				aiu_spdif: audio-controller-1 {
 +					#sound-dai-cells = <0>;
-+					compatible = "amlogic,meson-aiu-spdif-dma";
++					compatible = "amlogic,meson-aiu-spdif";
 +					interrupts = <GIC_SPI 50 IRQ_TYPE_EDGE_RISING>;
 +					status = "disabled";
 +				};
 +
-+				i2s_dai: i2s_dai {
-+					#sound-dai-cells = <0>;
-+					compatible = "amlogic,meson-i2s-dai";
-+					status = "disabled";
-+				};
-+
-+				spdif_dai: spdif_dai {
-+					#sound-dai-cells = <0>;
-+					compatible = "amlogic,meson-spdif-dai";
-+					status = "disabled";
-+				};
-+
 +			};
 +
  			uart_A: serial@84c0 {
  				compatible = "amlogic,meson-gx-uart";
  				reg = <0x0 0x84c0 0x0 0x18>;
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
-index 98cbba6..7913249 100644
+index 1ade7e486828..2c17cd2d732e 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
-@@ -659,6 +659,35 @@
+@@ -659,6 +659,24 @@
  	};
  };
  
@@ -82,18 +68,7 @@ index 98cbba6..7913249 100644
 +	reset-names = "aiu", "audin";
 +};
 +
-+&aiu_i2s_dma {
-+	clocks = <&clkc CLKID_I2S_OUT>;
-+	clock-names = "fast";
-+};
-+
-+&aiu_spdif_dma {
-+	clocks = <&clkc CLKID_IEC958>;
-+	clock-names = "fast";
-+
-+};
-+
-+&i2s_dai {
++&aiu_i2s {
 +	clocks = <&clkc CLKID_I2S_OUT>,
 +		 <&clkc CLKID_MIXER_IFACE>,
 +		 <&clkc CLKID_AOCLK_GATE>,
@@ -104,11 +79,11 @@ index 98cbba6..7913249 100644
  &pwrc_vpu {
  	resets = <&reset RESET_VIU>,
  		 <&reset RESET_VENC>,
-@@ -741,6 +770,15 @@
+@@ -741,6 +759,15 @@
  	num-cs = <1>;
  };
  
-+&spdif_dai {
++&aiu_spdif {
 +	clocks = <&clkc CLKID_IEC958>,
 +		 <&clkc CLKID_IEC958_GATE>,
 +		 <&clkc CLKID_CTS_MCLK_I958>,
@@ -120,16 +95,16 @@ index 98cbba6..7913249 100644
  &spifc {
  	clocks = <&clkc CLKID_SPI>;
  };
-@@ -774,3 +812,4 @@
+@@ -774,3 +801,4 @@
  	compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu";
  	power-domains = <&pwrc_vpu>;
  };
 +
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
-index c87a80e..20922cd 100644
+index 8f0bb3c44bd6..ad0f5448ad64 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
-@@ -660,6 +660,34 @@
+@@ -660,6 +660,24 @@
  	};
  };
  
@@ -143,17 +118,7 @@ index c87a80e..20922cd 100644
 +	reset-names = "aiu", "audin";
 +};
 +
-+&aiu_i2s_dma {
-+	clocks = <&clkc CLKID_I2S_OUT>;
-+	clock-names = "fast";
-+};
-+
-+&aiu_spdif_dma {
-+	clocks = <&clkc CLKID_IEC958>;
-+	clock-names = "fast";
-+};
-+
-+&i2s_dai {
++&aiu_i2s {
 +	clocks = <&clkc CLKID_I2S_OUT>,
 +		 <&clkc CLKID_MIXER_IFACE>,
 +		 <&clkc CLKID_AOCLK_GATE>,
@@ -164,11 +129,11 @@ index c87a80e..20922cd 100644
  &pwrc_vpu {
  	resets = <&reset RESET_VIU>,
  		 <&reset RESET_VENC>,
-@@ -742,6 +770,15 @@
+@@ -742,6 +760,15 @@
  	num-cs = <1>;
  };
  
-+&spdif_dai {
++&aiu_spdif {
 +	clocks = <&clkc CLKID_IEC958>,
 +		 <&clkc CLKID_IEC958_GATE>,
 +		 <&clkc CLKID_CTS_MCLK_I958>,
@@ -180,7 +145,7 @@ index c87a80e..20922cd 100644
  &spifc {
  	clocks = <&clkc CLKID_SPI>;
  };
-@@ -775,3 +812,4 @@
+@@ -775,3 +802,4 @@
  	compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-vpu";
  	power-domains = <&pwrc_vpu>;
  };

patch/kernel/meson64-dev/0007-ASoC-meson-add-initial-spdif-dai-support.patch

@@ -1,430 +0,0 @@
-From 67e2a1601f80648f5c318728218b788c51081fa3 Mon Sep 17 00:00:00 2001
-From: Jerome Brunet <jbrunet@baylibre.com>
-Date: Thu, 30 Mar 2017 13:46:03 +0200
-Subject: [PATCH] ASoC: meson: add initial spdif dai support
-
-Add support for the spdif dai found on Amlogic Meson SoC family.
-With this initial implementation, only uncompressed pcm playback
-from the spdif dma is supported. Future work will add compressed
-support, pcm playback from i2s dma and capture.
-
-Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
-
----
- sound/soc/meson/Kconfig     |   3 +-
- sound/soc/meson/Makefile    |   4 +-
- sound/soc/meson/spdif-dai.c | 374 ++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 379 insertions(+), 2 deletions(-)
- create mode 100644 sound/soc/meson/spdif-dai.c
-
-diff --git a/sound/soc/meson/Kconfig b/sound/soc/meson/Kconfig
-index 712303f..bc3d6f2 100644
---- a/sound/soc/meson/Kconfig
-+++ b/sound/soc/meson/Kconfig
-@@ -84,6 +84,7 @@ config SND_SOC_MESON_I2S
- config SND_SOC_MESON_SPDIF
- 	tristate "Meson spdif interface"
- 	depends on SND_SOC_MESON
-+	select SND_PCM_IEC958
- 	help
--	  Say Y or M if you want to add support for spdif dma driver for Amlogic
-+	  Say Y or M if you want to add support for spdif driver for Amlogic
- 	  Meson SoCs.
-diff --git a/sound/soc/meson/Makefile b/sound/soc/meson/Makefile
-index dc5164a7..44f79d8 100644
---- a/sound/soc/meson/Makefile
-+++ b/sound/soc/meson/Makefile
-@@ -24,8 +24,10 @@ snd-soc-meson-audio-core-objs	 := audio-core.o
- snd-soc-meson-aiu-i2s-dma-objs	 := aiu-i2s-dma.o
- snd-soc-meson-aiu-spdif-dma-objs := aiu-spdif-dma.o
- snd-soc-meson-i2s-dai-objs	 := i2s-dai.o
-+snd-soc-meson-spdif-dai-objs	 := spdif-dai.o
- 
- obj-$(CONFIG_SND_SOC_MESON) += snd-soc-meson-audio-core.o
- obj-$(CONFIG_SND_SOC_MESON_I2S)	+= snd-soc-meson-aiu-i2s-dma.o
- obj-$(CONFIG_SND_SOC_MESON_I2S)	+= snd-soc-meson-i2s-dai.o
--obj-$(CONFIG_SND_SOC_MESON_SPDIF) += snd-soc-meson-aiu-spdif-dma.o
-\ No newline at end of file
-+obj-$(CONFIG_SND_SOC_MESON_SPDIF) += snd-soc-meson-aiu-spdif-dma.o
-+obj-$(CONFIG_SND_SOC_MESON_SPDIF) += snd-soc-meson-spdif-dai.o
-\ No newline at end of file
-diff --git a/sound/soc/meson/spdif-dai.c b/sound/soc/meson/spdif-dai.c
-new file mode 100644
-index 0000000..e763000
---- /dev/null
-+++ b/sound/soc/meson/spdif-dai.c
-@@ -0,0 +1,374 @@
-+/*
-+ * Copyright (C) 2017 BayLibre, SAS
-+ * Author: Jerome Brunet <jbrunet@baylibre.com>
-+ * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of the
-+ * License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <linux/clk.h>
-+#include <linux/mfd/syscon.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/platform_device.h>
-+#include <linux/regmap.h>
-+
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+#include <sound/soc-dai.h>
-+#include <sound/pcm_iec958.h>
-+
-+#include "aiu-regs.h"
-+#include "audio-core.h"
-+
-+#define DRV_NAME "meson-spdif-dai"
-+
-+struct meson_spdif_dai {
-+	struct meson_audio_core_data *core;
-+	struct clk *iface;
-+	struct clk *fast;
-+	struct clk *mclk_i958;
-+	struct clk *mclk;
-+};
-+
-+#define AIU_CLK_CTRL_958_DIV_EN			BIT(1)
-+#define AIU_CLK_CTRL_958_DIV_MASK		GENMASK(5, 4)
-+#define AIU_CLK_CTRL_958_DIV_MORE		BIT(12)
-+#define AIU_MEM_IEC958_CONTROL_MODE_LINEAR	BIT(8)
-+#define AIU_958_CTRL_HOLD_EN			BIT(0)
-+#define AIU_958_MISC_NON_PCM			BIT(0)
-+#define AIU_958_MISC_MODE_16BITS		BIT(1)
-+#define AIU_958_MISC_16BITS_ALIGN_MASK		GENMASK(6, 5)
-+#define AIU_958_MISC_16BITS_ALIGN(val)		((val) << 5)
-+#define AIU_958_MISC_MODE_32BITS		BIT(7)
-+#define AIU_958_MISC_32BITS_SHIFT_MASK		GENMASK(10, 8)
-+#define AIU_958_MISC_32BITS_SHIFT(val)		((val) << 8)
-+#define AIU_958_MISC_U_FROM_STREAM		BIT(12)
-+#define AIU_958_MISC_FORCE_LR			BIT(13)
-+
-+#define AIU_CS_WORD_LEN 4
-+
-+static void __hold(struct meson_spdif_dai *priv, bool enable)
-+{
-+	regmap_update_bits(priv->core->aiu, AIU_958_CTRL,
-+			   AIU_958_CTRL_HOLD_EN,
-+			   enable ? AIU_958_CTRL_HOLD_EN : 0);
-+}
-+
-+static void __divider_enable(struct meson_spdif_dai *priv, bool enable)
-+{
-+	regmap_update_bits(priv->core->aiu, AIU_CLK_CTRL,
-+			   AIU_CLK_CTRL_958_DIV_EN,
-+			   enable ? AIU_CLK_CTRL_958_DIV_EN : 0);
-+}
-+
-+static void __playback_start(struct meson_spdif_dai *priv)
-+{
-+	__divider_enable(priv, true);
-+	__hold(priv, false);
-+}
-+
-+static void __playback_stop(struct meson_spdif_dai *priv)
-+{
-+	__hold(priv, true);
-+	__divider_enable(priv, false);
-+}
-+
-+static int meson_spdif_dai_trigger(struct snd_pcm_substream *substream, int cmd,
-+				   struct snd_soc_dai *dai)
-+{
-+	struct meson_spdif_dai *priv = snd_soc_dai_get_drvdata(dai);
-+
-+	switch (cmd) {
-+	case SNDRV_PCM_TRIGGER_START:
-+	case SNDRV_PCM_TRIGGER_RESUME:
-+	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-+		__playback_start(priv);
-+		return 0;
-+
-+	case SNDRV_PCM_TRIGGER_STOP:
-+	case SNDRV_PCM_TRIGGER_SUSPEND:
-+	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-+		__playback_stop(priv);
-+		return 0;
-+
-+	default:
-+		return -EINVAL;
-+	}
-+}
-+
-+static int __setup_spdif_clk(struct meson_spdif_dai *priv, unsigned int rate)
-+{
-+	unsigned int mrate;
-+
-+	/* Leave the internal divisor alone */
-+	regmap_update_bits(priv->core->aiu, AIU_CLK_CTRL,
-+			   AIU_CLK_CTRL_958_DIV_MASK |
-+			   AIU_CLK_CTRL_958_DIV_MORE,
-+			   0);
-+
-+	/* 2 * 32bits per subframe * 2 channels = 128 */
-+	mrate = rate * 128;
-+	return clk_set_rate(priv->mclk, mrate);
-+}
-+
-+static int __setup_cs_word(struct meson_spdif_dai *priv,
-+			   struct snd_pcm_hw_params *params)
-+{
-+	u8 cs[AIU_CS_WORD_LEN];
-+	u32 val;
-+	int ret;
-+
-+	ret = snd_pcm_create_iec958_consumer_hw_params(params, cs,
-+						       AIU_CS_WORD_LEN);
-+	if (ret < 0)
-+		return -EINVAL;
-+
-+	/* Write the 1st half word */
-+	val = cs[1] | cs[0] << 8;
-+	regmap_write(priv->core->aiu, AIU_958_CHSTAT_L0, val);
-+	regmap_write(priv->core->aiu, AIU_958_CHSTAT_R0, val);
-+
-+	/* Write the 2nd half word */
-+	val = cs[3] | cs[2] << 8;
-+	regmap_write(priv->core->aiu, AIU_958_CHSTAT_L1, val);
-+	regmap_write(priv->core->aiu, AIU_958_CHSTAT_R1, val);
-+
-+	return 0;
-+}
-+
-+static int __setup_pcm_fmt(struct meson_spdif_dai *priv,
-+			   unsigned int width)
-+{
-+	u32 val = 0;
-+
-+	switch (width) {
-+	case 16:
-+		val |= AIU_958_MISC_MODE_16BITS;
-+		val |= AIU_958_MISC_16BITS_ALIGN(2);
-+		break;
-+	case 32:
-+	case 24:
-+		/*
-+		 * Looks like this should only be set for 32bits mode, but the
-+		 * vendor kernel sets it like this for 24bits as well, let's
-+		 * try and see
-+		 */
-+		val |= AIU_958_MISC_MODE_32BITS;
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	/* No idea what this actually does, copying the vendor kernel for now */
-+	val |= AIU_958_MISC_FORCE_LR;
-+	val |= AIU_958_MISC_U_FROM_STREAM;
-+
-+	regmap_update_bits(priv->core->aiu, AIU_958_MISC,
-+			   AIU_958_MISC_NON_PCM |
-+			   AIU_958_MISC_MODE_16BITS |
-+			   AIU_958_MISC_16BITS_ALIGN_MASK |
-+			   AIU_958_MISC_MODE_32BITS |
-+			   AIU_958_MISC_FORCE_LR,
-+			   val);
-+
-+	return 0;
-+}
-+
-+static int meson_spdif_dai_hw_params(struct snd_pcm_substream *substream,
-+				     struct snd_pcm_hw_params *params,
-+				     struct snd_soc_dai *dai)
-+{
-+	struct meson_spdif_dai *priv = snd_soc_dai_get_drvdata(dai);
-+	int ret;
-+
-+	ret = __setup_spdif_clk(priv, params_rate(params));
-+	if (ret) {
-+		dev_err(dai->dev, "Unable to set the spdif clock\n");
-+		return ret;
-+	}
-+
-+	ret = __setup_cs_word(priv, params);
-+	if (ret) {
-+		dev_err(dai->dev, "Unable to set the channel status word\n");
-+		return ret;
-+	}
-+
-+	ret = __setup_pcm_fmt(priv, params_width(params));
-+	if (ret) {
-+		dev_err(dai->dev, "Unable to set the pcm format\n");
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+static int meson_spdif_dai_startup(struct snd_pcm_substream *substream,
-+				   struct snd_soc_dai *dai)
-+{
-+	struct meson_spdif_dai *priv = snd_soc_dai_get_drvdata(dai);
-+	int ret;
-+
-+	/* Power up the spdif fast domain - can't write the registers w/o it */
-+	ret = clk_prepare_enable(priv->fast);
-+	if (ret)
-+		goto out_clk_fast;
-+
-+	/* Make sure nothing gets out of the DAI yet*/
-+	__hold(priv, true);
-+
-+	ret = clk_set_parent(priv->mclk, priv->mclk_i958);
-+	if (ret)
-+		return ret;
-+
-+	/* Enable the clock gate */
-+	ret = clk_prepare_enable(priv->iface);
-+	if (ret)
-+		goto out_clk_iface;
-+
-+	/* Enable the spdif clock */
-+	ret = clk_prepare_enable(priv->mclk);
-+	if (ret)
-+		goto out_mclk;
-+
-+	/*
-+	 * Make sure the interface expect a memory layout we can work with
-+	 * MEM prefixed register usually belong to the DMA, but when the spdif
-+	 * DAI takes data from the i2s buffer, we need to make sure it works in
-+	 * split mode and not the  "normal mode" (channel samples packed in
-+	 * 32 bytes groups)
-+	 */
-+	regmap_update_bits(priv->core->aiu, AIU_MEM_IEC958_CONTROL,
-+			   AIU_MEM_IEC958_CONTROL_MODE_LINEAR,
-+			   AIU_MEM_IEC958_CONTROL_MODE_LINEAR);
-+
-+	return 0;
-+
-+out_mclk:
-+	clk_disable_unprepare(priv->iface);
-+out_clk_iface:
-+	clk_disable_unprepare(priv->fast);
-+out_clk_fast:
-+	return ret;
-+}
-+
-+static void meson_spdif_dai_shutdown(struct snd_pcm_substream *substream,
-+				   struct snd_soc_dai *dai)
-+{
-+	struct meson_spdif_dai *priv = snd_soc_dai_get_drvdata(dai);
-+
-+	clk_disable_unprepare(priv->iface);
-+	clk_disable_unprepare(priv->mclk);
-+	clk_disable_unprepare(priv->fast);
-+}
-+
-+static const struct snd_soc_dai_ops meson_spdif_dai_ops = {
-+	.startup    = meson_spdif_dai_startup,
-+	.shutdown   = meson_spdif_dai_shutdown,
-+	.trigger    = meson_spdif_dai_trigger,
-+	.hw_params  = meson_spdif_dai_hw_params,
-+};
-+
-+static struct snd_soc_dai_driver meson_spdif_dai = {
-+	.playback = {
-+		.stream_name = "Playback",
-+		.channels_min = 2,
-+		.channels_max = 2,
-+		.rates = (SNDRV_PCM_RATE_32000 |
-+			  SNDRV_PCM_RATE_44100 |
-+			  SNDRV_PCM_RATE_48000 |
-+			  SNDRV_PCM_RATE_96000 |
-+			  SNDRV_PCM_RATE_192000),
-+		.formats = (SNDRV_PCM_FMTBIT_S16_LE |
-+			    SNDRV_PCM_FMTBIT_S24_LE)
-+	},
-+	.ops = &meson_spdif_dai_ops,
-+};
-+
-+static const struct snd_soc_component_driver meson_spdif_dai_component = {
-+	.name	= DRV_NAME,
-+};
-+
-+static int meson_spdif_dai_probe(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct meson_spdif_dai *priv;
-+
-+	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
-+	if (!priv)
-+		return -ENOMEM;
-+
-+	platform_set_drvdata(pdev, priv);
-+	priv->core = dev_get_drvdata(dev->parent);
-+
-+	priv->fast = devm_clk_get(dev, "fast");
-+	if (IS_ERR(priv->fast)) {
-+		if (PTR_ERR(priv->fast) != -EPROBE_DEFER)
-+			dev_err(dev, "Can't get spdif fast domain clockt\n");
-+		return PTR_ERR(priv->fast);
-+	}
-+
-+	priv->iface = devm_clk_get(dev, "iface");
-+	if (IS_ERR(priv->iface)) {
-+		if (PTR_ERR(priv->iface) != -EPROBE_DEFER)
-+			dev_err(dev,
-+				"Can't get the dai clock gate\n");
-+		return PTR_ERR(priv->iface);
-+	}
-+
-+	priv->mclk_i958 = devm_clk_get(dev, "mclk_i958");
-+	if (IS_ERR(priv->mclk_i958)) {
-+		if (PTR_ERR(priv->mclk_i958) != -EPROBE_DEFER)
-+			dev_err(dev, "Can't get the spdif master clock\n");
-+		return PTR_ERR(priv->mclk_i958);
-+	}
-+
-+	/*
-+	 * TODO: the spdif dai can also get its data from the i2s fifo.
-+	 * For this use-case, the DAI driver will need to get the i2s master
-+	 * clock in order to reparent the spdif clock from cts_mclk_i958 to
-+	 * cts_amclk
-+	 */
-+
-+	priv->mclk = devm_clk_get(dev, "mclk");
-+	if (IS_ERR(priv->mclk)) {
-+		if (PTR_ERR(priv->mclk) != -EPROBE_DEFER)
-+			dev_err(dev, "Can't get the spdif input mux clock\n");
-+		return PTR_ERR(priv->mclk);
-+	}
-+
-+	return devm_snd_soc_register_component(dev, &meson_spdif_dai_component,
-+					       &meson_spdif_dai, 1);
-+}
-+
-+static const struct of_device_id meson_spdif_dai_of_match[] = {
-+	{ .compatible = "amlogic,meson-spdif-dai", },
-+	{ .compatible = "amlogic,meson-gxbb-spdif-dai", },
-+	{ .compatible = "amlogic,meson-gxl-spdif-dai", },
-+	{}
-+};
-+MODULE_DEVICE_TABLE(of, meson_spdif_dai_of_match);
-+
-+static struct platform_driver meson_spdif_dai_pdrv = {
-+	.probe = meson_spdif_dai_probe,
-+	.driver = {
-+		.name = DRV_NAME,
-+		.of_match_table = meson_spdif_dai_of_match,
-+	},
-+};
-+module_platform_driver(meson_spdif_dai_pdrv);
-+
-+MODULE_DESCRIPTION("Meson spdif DAI ASoC Driver");
-+MODULE_AUTHOR("Jerome Brunet <jbrunet@baylibre.com>");
-+MODULE_LICENSE("GPL v2");

patch/kernel/meson64-dev/0008-snd-meson-activate-HDMI-audio-path.patch

@@ -0,0 +1,52 @@
+From 2a4594a79b521e473400f2b691912edaf71fb703 Mon Sep 17 00:00:00 2001
+From: Jerome Brunet <jbrunet@baylibre.com>
+Date: Fri, 7 Jul 2017 17:39:21 +0200
+Subject: [PATCH] snd: meson: activate HDMI audio path
+
+Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
+---
+ sound/soc/meson-gx/aiu-i2s.c | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/sound/soc/meson-gx/aiu-i2s.c b/sound/soc/meson-gx/aiu-i2s.c
+index d57f351b502f..450f1d20a1d6 100644
+--- a/sound/soc/meson-gx/aiu-i2s.c
++++ b/sound/soc/meson-gx/aiu-i2s.c
+@@ -332,8 +332,19 @@ static int meson_aiu_i2s_dma_new(struct snd_soc_pcm_runtime *rtd)
+ #define AIU_CLK_CTRL_ALRCLK_RIGHT_J		(2 << 8)
+ #define AIU_CLK_CTRL_MORE_I2S_DIV_MASK		GENMASK(5, 0)
+ #define AIU_CLK_CTRL_MORE_I2S_DIV(div)		(((div) - 1) << 0)
++#define AIU_CLK_CTRL_MORE_HDMI_TX_SEL_MASK     BIT(6)
++#define AIU_CLK_CTRL_MORE_HDMI_TX_I958_CLK     (0 << 6)
++#define AIU_CLK_CTRL_MORE_HDMI_TX_INT_CLK      (1 << 6)
+ #define AIU_CODEC_DAC_LRCLK_CTRL_DIV_MASK	GENMASK(11, 0)
+ #define AIU_CODEC_DAC_LRCLK_CTRL_DIV(div)	(((div) - 1) << 0)
++#define AIU_HDMI_CLK_DATA_CTRL_CLK_SEL_MASK    GENMASK(1, 0)
++#define AIU_HDMI_CLK_DATA_CTRL_CLK_DISABLE     (0 << 0)
++#define AIU_HDMI_CLK_DATA_CTRL_CLK_PCM         (1 << 0)
++#define AIU_HDMI_CLK_DATA_CTRL_CLK_I2S         (2 << 0)
++#define AIU_HDMI_CLK_DATA_CTRL_DATA_SEL_MASK   GENMASK(5, 4)
++#define AIU_HDMI_CLK_DATA_CTRL_DATA_MUTE       (0 << 4)
++#define AIU_HDMI_CLK_DATA_CTRL_DATA_PCM                (1 << 4)
++#define AIU_HDMI_CLK_DATA_CTRL_DATA_I2S                (2 << 4)
+ #define AIU_I2S_DAC_CFG_PAYLOAD_SIZE_MASK	GENMASK(1, 0)
+ #define AIU_I2S_DAC_CFG_AOCLK_32		(0 << 0)
+ #define AIU_I2S_DAC_CFG_AOCLK_48		(2 << 0)
+@@ -497,6 +508,17 @@ static int meson_aiu_i2s_dai_hw_params(struct snd_pcm_substream *substream,
+ 		return ret;
+ 	}
+ 
++       /* Quick and dirty hack for HDMI */
++	regmap_update_bits(priv->core->aiu, AIU_HDMI_CLK_DATA_CTRL,
++			   AIU_HDMI_CLK_DATA_CTRL_CLK_SEL_MASK |
++			   AIU_HDMI_CLK_DATA_CTRL_DATA_SEL_MASK,
++			   AIU_HDMI_CLK_DATA_CTRL_CLK_I2S |
++			   AIU_HDMI_CLK_DATA_CTRL_DATA_I2S);
++
++	regmap_update_bits(priv->core->aiu, AIU_CLK_CTRL_MORE,
++			   AIU_CLK_CTRL_MORE_HDMI_TX_SEL_MASK,
++			   AIU_CLK_CTRL_MORE_HDMI_TX_INT_CLK);
++
+ 	return 0;
+ }
+ 

patch/kernel/meson64-dev/0009-drm-meson-select-dw-hdmi-i2s-audio-for-meson-hdmi.patch

@@ -1,16 +1,15 @@
-From d46542e83265b476b32b94729e609a9a7767deac Mon Sep 17 00:00:00 2001
+From f0f8c9a57b90283f9222932ae9ca4105d359fa33 Mon Sep 17 00:00:00 2001
 From: Jerome Brunet <jbrunet@baylibre.com>
 Date: Tue, 14 Feb 2017 19:18:04 +0100
 Subject: [PATCH] drm/meson: select dw-hdmi i2s audio for meson hdmi
 
 Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
-
 ---
  drivers/gpu/drm/meson/Kconfig | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/gpu/drm/meson/Kconfig b/drivers/gpu/drm/meson/Kconfig
-index 3ce51d8..02d400b 100644
+index 3ce51d8dfe1c..02d400b8795c 100644
 --- a/drivers/gpu/drm/meson/Kconfig
 +++ b/drivers/gpu/drm/meson/Kconfig
 @@ -13,3 +13,4 @@ config DRM_MESON_DW_HDMI

patch/kernel/meson64-dev/0010-ARM64-dts-meson-gx-add-sound-dai-cells-to-HDMI-node.patch

@@ -1,17 +1,16 @@
-From 0eb1a7bb3fd9e1ff2f368bb20490c7a032fc96e6 Mon Sep 17 00:00:00 2001
+From d9297a400e9c2d5f03f4048dbb9387462d778170 Mon Sep 17 00:00:00 2001
 From: Jerome Brunet <jbrunet@baylibre.com>
 Date: Wed, 20 Sep 2017 18:01:26 +0200
 Subject: [PATCH] ARM64: dts: meson-gx: add sound-dai-cells to HDMI node
 
 Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
-
 ---
  arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 1 +
  arch/arm64/boot/dts/amlogic/meson-gxl.dtsi  | 1 +
  2 files changed, 2 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
-index 7913249..2a4d506 100644
+index 2c17cd2d732e..61c785d598e0 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
 @@ -305,6 +305,7 @@
@@ -23,7 +22,7 @@ index 7913249..2a4d506 100644
  
  &sysctrl {
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
-index 20922cd..9f4b618 100644
+index ad0f5448ad64..d4c697e0ec75 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
 @@ -257,6 +257,7 @@

patch/kernel/meson64-dev/0010-snd-meson-activate-HDMI-audio-path.patch

@@ -1,53 +0,0 @@
-From c89e4a9d376b72bb00c1c71795b86fe81914a3ea Mon Sep 17 00:00:00 2001
-From: Jerome Brunet <jbrunet@baylibre.com>
-Date: Fri, 7 Jul 2017 17:39:21 +0200
-Subject: [PATCH] snd: meson: activate HDMI audio path
-
-Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
-
----
- sound/soc/meson/i2s-dai.c | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
-diff --git a/sound/soc/meson/i2s-dai.c b/sound/soc/meson/i2s-dai.c
-index 1008af8..63fe098 100644
---- a/sound/soc/meson/i2s-dai.c
-+++ b/sound/soc/meson/i2s-dai.c
-@@ -56,8 +56,19 @@ struct meson_i2s_dai {
- #define AIU_CLK_CTRL_ALRCLK_RIGHT_J		(2 << 8)
- #define AIU_CLK_CTRL_MORE_I2S_DIV_MASK		GENMASK(5, 0)
- #define AIU_CLK_CTRL_MORE_I2S_DIV(div)		(((div) - 1) << 0)
-+#define AIU_CLK_CTRL_MORE_HDMI_TX_SEL_MASK	BIT(6)
-+#define AIU_CLK_CTRL_MORE_HDMI_TX_I958_CLK	(0 << 6)
-+#define AIU_CLK_CTRL_MORE_HDMI_TX_INT_CLK	(1 << 6)
- #define AIU_CODEC_DAC_LRCLK_CTRL_DIV_MASK	GENMASK(11, 0)
- #define AIU_CODEC_DAC_LRCLK_CTRL_DIV(div)	(((div) - 1) << 0)
-+#define AIU_HDMI_CLK_DATA_CTRL_CLK_SEL_MASK	GENMASK(1, 0)
-+#define AIU_HDMI_CLK_DATA_CTRL_CLK_DISABLE	(0 << 0)
-+#define AIU_HDMI_CLK_DATA_CTRL_CLK_PCM		(1 << 0)
-+#define AIU_HDMI_CLK_DATA_CTRL_CLK_I2S		(2 << 0)
-+#define AIU_HDMI_CLK_DATA_CTRL_DATA_SEL_MASK	GENMASK(5, 4)
-+#define AIU_HDMI_CLK_DATA_CTRL_DATA_MUTE	(0 << 4)
-+#define AIU_HDMI_CLK_DATA_CTRL_DATA_PCM		(1 << 4)
-+#define AIU_HDMI_CLK_DATA_CTRL_DATA_I2S		(2 << 4)
- #define AIU_I2S_DAC_CFG_PAYLOAD_SIZE_MASK	GENMASK(1, 0)
- #define AIU_I2S_DAC_CFG_AOCLK_32		(0 << 0)
- #define AIU_I2S_DAC_CFG_AOCLK_48		(2 << 0)
-@@ -221,6 +232,17 @@ static int meson_i2s_dai_hw_params(struct snd_pcm_substream *substream,
- 		return ret;
- 	}
- 
-+	/* Quick and dirty hack for HDMI */
-+	regmap_update_bits(priv->core->aiu, AIU_HDMI_CLK_DATA_CTRL,
-+			   AIU_HDMI_CLK_DATA_CTRL_CLK_SEL_MASK |
-+			   AIU_HDMI_CLK_DATA_CTRL_DATA_SEL_MASK,
-+			   AIU_HDMI_CLK_DATA_CTRL_CLK_I2S |
-+			   AIU_HDMI_CLK_DATA_CTRL_DATA_I2S);
-+
-+	regmap_update_bits(priv->core->aiu, AIU_CLK_CTRL_MORE,
-+			   AIU_CLK_CTRL_MORE_HDMI_TX_SEL_MASK,
-+			   AIU_CLK_CTRL_MORE_HDMI_TX_INT_CLK);
-+
- 	return 0;
- }
- 

patch/kernel/meson64-dev/0011-ARM64-dts-meson-activate-hdmi-audio-HDMI-enabled-boa.patch

@@ -1,4 +1,4 @@
-From f0417a0c309fb02a5896abb868a52a1a3e23d610 Mon Sep 17 00:00:00 2001
+From 6c40b6e79d64e434d4ad07ed373fc308f119ea53 Mon Sep 17 00:00:00 2001
 From: Jerome Brunet <jbrunet@baylibre.com>
 Date: Wed, 20 Sep 2017 18:10:08 +0200
 Subject: [PATCH] ARM64: dts: meson: activate hdmi audio HDMI enabled boards
@@ -11,27 +11,26 @@ the audio I expect to see merged
 
 Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
 Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
-
 ---
- .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 45 ++++++++++++++++++++++
- .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts      | 45 ++++++++++++++++++++++
- .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts    | 45 ++++++++++++++++++++++
- .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 45 ++++++++++++++++++++++
- arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi   | 45 ++++++++++++++++++++++
- arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi  | 45 ++++++++++++++++++++++
- .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts     | 45 ++++++++++++++++++++++
- .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts   | 45 ++++++++++++++++++++++
- .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts    | 45 ++++++++++++++++++++++
- .../boot/dts/amlogic/meson-gxl-s905x-p212.dts      | 45 ++++++++++++++++++++++
- .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts     | 45 ++++++++++++++++++++++
- .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 45 ++++++++++++++++++++++
- 12 files changed, 540 insertions(+)
+ .../boot/dts/amlogic/meson-gx-p23x-q20x.dtsi  | 37 +++++++++++++++++++
+ .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 37 +++++++++++++++++++
+ .../dts/amlogic/meson-gxbb-nexbox-a95x.dts    | 37 +++++++++++++++++++
+ .../boot/dts/amlogic/meson-gxbb-odroidc2.dts  | 37 +++++++++++++++++++
+ .../boot/dts/amlogic/meson-gxbb-p20x.dtsi     | 37 +++++++++++++++++++
+ .../boot/dts/amlogic/meson-gxbb-wetek.dtsi    | 37 +++++++++++++++++++
+ .../amlogic/meson-gxl-s905x-khadas-vim.dts    | 37 +++++++++++++++++++
+ .../amlogic/meson-gxl-s905x-libretech-cc.dts  | 37 +++++++++++++++++++
+ .../amlogic/meson-gxl-s905x-nexbox-a95x.dts   | 37 +++++++++++++++++++
+ .../boot/dts/amlogic/meson-gxl-s905x-p212.dts | 37 +++++++++++++++++++
+ .../dts/amlogic/meson-gxm-khadas-vim2.dts     | 37 +++++++++++++++++++
+ .../boot/dts/amlogic/meson-gxm-nexbox-a1.dts  | 37 +++++++++++++++++++
+ 12 files changed, 444 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
-index 765247b..fb9ad6f 100644
+index 765247bc4f24..87ec1c193f12 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
-@@ -102,6 +102,39 @@
+@@ -102,6 +102,35 @@
  			};
  		};
  	};
@@ -40,27 +39,23 @@ index 765247b..fb9ad6f 100644
 +		compatible = "simple-audio-card";
 +		simple-audio-card,name = "meson-gx-audio";
 +
-+		assigned-clocks = <&clkc CLKID_MPLL2>,
-+				  <&clkc CLKID_MPLL0>,
-+				  <&clkc CLKID_MPLL1>;
-+		assigned-clock-parents = <0>, <0>, <0>;
-+		assigned-clock-rates = <294912000>,
-+				       <270950400>,
-+				       <393216000>;
-+
 +		simple-audio-card,dai-link@0 {
 +			/* HDMI Output */
 +			format = "i2s";
 +			mclk-fs = <256>;
-+			bitclock-master = <&i2s_dai>;
-+			frame-master = <&i2s_dai>;
++			bitclock-master = <&aiu_i2s>;
++			frame-master = <&aiu_i2s>;
 +
-+			plat {
-+				sound-dai = <&aiu_i2s_dma>;
-+			};
++			assigned-clocks = <&clkc CLKID_MPLL2>,
++					  <&clkc CLKID_MPLL0>,
++					  <&clkc CLKID_MPLL1>;
++			assigned-clock-parents = <0>, <0>, <0>;
++			assigned-clock-rates = <294912000>,
++					       <270950400>,
++					       <393216000>;
 +
 +			cpu {
-+				sound-dai = <&i2s_dai>;
++				sound-dai = <&aiu_i2s>;
 +			};
 +
 +			codec {
@@ -71,7 +66,7 @@ index 765247b..fb9ad6f 100644
  };
  
  &cec_AO {
-@@ -111,6 +144,14 @@
+@@ -111,6 +140,14 @@
  	hdmi-phandle = <&hdmi_tx>;
  };
  
@@ -79,29 +74,18 @@ index 765247b..fb9ad6f 100644
 +	status = "okay";
 +};
 +
-+&aiu_i2s_dma {
++&aiu_i2s {
 +	status = "okay";
 +};
 +
  &cvbs_vdac_port {
  	cvbs_vdac_out: endpoint {
  		remote-endpoint = <&cvbs_connector_in>;
-@@ -133,6 +174,10 @@
- 	};
- };
- 
-+&i2s_dai {
-+	status = "okay";
-+};
-+
- &ir {
- 	status = "okay";
- 	pinctrl-0 = <&remote_input_ao_pins>;
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
-index cbe99bd..5b10de9 100644
+index cbe99bd4e06d..d72b5378eead 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
-@@ -88,6 +88,39 @@
+@@ -88,6 +88,35 @@
  		clock-names = "ext_clock";
  	};
  
@@ -109,27 +93,23 @@ index cbe99bd..5b10de9 100644
 +		compatible = "simple-audio-card";
 +		simple-audio-card,name = "meson-gx-audio";
 +
-+		assigned-clocks = <&clkc CLKID_MPLL2>,
-+				  <&clkc CLKID_MPLL0>,
-+				  <&clkc CLKID_MPLL1>;
-+		assigned-clock-parents = <0>, <0>, <0>;
-+		assigned-clock-rates = <294912000>,
-+				       <270950400>,
-+				       <393216000>;
-+
 +		simple-audio-card,dai-link@0 {
 +			/* HDMI Output */
 +			format = "i2s";
 +			mclk-fs = <256>;
-+			bitclock-master = <&i2s_dai>;
-+			frame-master = <&i2s_dai>;
++			bitclock-master = <&aiu_i2s>;
++			frame-master = <&aiu_i2s>;
 +
-+			plat {
-+				sound-dai = <&aiu_i2s_dma>;
-+			};
++			assigned-clocks = <&clkc CLKID_MPLL2>,
++					  <&clkc CLKID_MPLL0>,
++					  <&clkc CLKID_MPLL1>;
++			assigned-clock-parents = <0>, <0>, <0>;
++			assigned-clock-rates = <294912000>,
++					       <270950400>,
++					       <393216000>;
 +
 +			cpu {
-+				sound-dai = <&i2s_dai>;
++				sound-dai = <&aiu_i2s>;
 +			};
 +
 +			codec {
@@ -141,7 +121,7 @@ index cbe99bd..5b10de9 100644
  	vcc1v8: regulator-vcc1v8 {
  		compatible = "regulator-fixed";
  		regulator-name = "VCC1.8V";
-@@ -131,6 +164,14 @@
+@@ -131,6 +160,14 @@
  	};
  };
  
@@ -149,29 +129,18 @@ index cbe99bd..5b10de9 100644
 +	status = "okay";
 +};
 +
-+&aiu_i2s_dma {
++&aiu_i2s {
 +	status = "okay";
 +};
 +
  &cec_AO {
  	status = "okay";
  	pinctrl-0 = <&ao_cec_pins>;
-@@ -185,6 +226,10 @@
- 	};
- };
- 
-+&i2s_dai {
-+	status = "okay";
-+};
-+
- &ir {
- 	status = "okay";
- 	pinctrl-0 = <&remote_input_ao_pins>;
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
-index 4cf7f6e..ff87bdc 100644
+index 4cf7f6e80c6a..1e29891d3bae 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
-@@ -119,6 +119,39 @@
+@@ -119,6 +119,35 @@
  		clock-names = "ext_clock";
  	};
  
@@ -179,27 +148,23 @@ index 4cf7f6e..ff87bdc 100644
 +		compatible = "simple-audio-card";
 +		simple-audio-card,name = "meson-gx-audio";
 +
-+		assigned-clocks = <&clkc CLKID_MPLL2>,
-+				  <&clkc CLKID_MPLL0>,
-+				  <&clkc CLKID_MPLL1>;
-+		assigned-clock-parents = <0>, <0>, <0>;
-+		assigned-clock-rates = <294912000>,
-+				       <270950400>,
-+				       <393216000>;
-+
 +		simple-audio-card,dai-link@0 {
 +			/* HDMI Output */
 +			format = "i2s";
 +			mclk-fs = <256>;
-+			bitclock-master = <&i2s_dai>;
-+			frame-master = <&i2s_dai>;
++			bitclock-master = <&aiu_i2s>;
++			frame-master = <&aiu_i2s>;
 +
-+			plat {
-+				sound-dai = <&aiu_i2s_dma>;
-+			};
++			assigned-clocks = <&clkc CLKID_MPLL2>,
++					  <&clkc CLKID_MPLL0>,
++					  <&clkc CLKID_MPLL1>;
++			assigned-clock-parents = <0>, <0>, <0>;
++			assigned-clock-rates = <294912000>,
++					       <270950400>,
++					       <393216000>;
 +
 +			cpu {
-+				sound-dai = <&i2s_dai>;
++				sound-dai = <&aiu_i2s>;
 +			};
 +
 +			codec {
@@ -207,11 +172,11 @@ index 4cf7f6e..ff87bdc 100644
 +			};
 +		};
 +	};
-+
++	
  	cvbs-connector {
  		compatible = "composite-video-connector";
  
-@@ -154,6 +187,14 @@
+@@ -154,6 +183,14 @@
  	hdmi-phandle = <&hdmi_tx>;
  };
  
@@ -219,29 +184,18 @@ index 4cf7f6e..ff87bdc 100644
 +	status = "okay";
 +};
 +
-+&aiu_i2s_dma {
++&aiu_i2s {
 +	status = "okay";
 +};
 +
  &ethmac {
  	status = "okay";
  	pinctrl-0 = <&eth_rmii_pins>;
-@@ -190,6 +231,10 @@
- 	};
- };
- 
-+&i2s_dai {
-+	status = "okay";
-+};
-+
- &ir {
- 	status = "okay";
- 	pinctrl-0 = <&remote_input_ao_pins>;
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
-index 54954b3..3da3309 100644
+index 54954b314a45..7b89a474d460 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
-@@ -110,6 +110,39 @@
+@@ -110,6 +110,35 @@
  			};
  		};
  	};
@@ -250,38 +204,34 @@ index 54954b3..3da3309 100644
 +		compatible = "simple-audio-card";
 +		simple-audio-card,name = "meson-gx-audio";
 +
-+		assigned-clocks = <&clkc CLKID_MPLL2>,
-+				  <&clkc CLKID_MPLL0>,
-+				  <&clkc CLKID_MPLL1>;
-+		assigned-clock-parents = <0>, <0>, <0>;
-+		assigned-clock-rates = <294912000>,
-+				       <270950400>,
-+				       <393216000>;
-+
 +		simple-audio-card,dai-link@0 {
 +			/* HDMI Output */
 +			format = "i2s";
 +			mclk-fs = <256>;
-+			bitclock-master = <&i2s_dai>;
-+			frame-master = <&i2s_dai>;
++			bitclock-master = <&aiu_i2s>;
++			frame-master = <&aiu_i2s>;
 +
-+			plat {
-+				sound-dai = <&aiu_i2s_dma>;
-+			};
++			assigned-clocks = <&clkc CLKID_MPLL2>,
++					  <&clkc CLKID_MPLL0>,
++					  <&clkc CLKID_MPLL1>;
++			assigned-clock-parents = <0>, <0>, <0>;
++			assigned-clock-rates = <294912000>,
++					       <270950400>,
++					       <393216000>;
 +
 +			cpu {
-+				sound-dai = <&i2s_dai>;
++				sound-dai = <&aiu_i2s>;
 +			};
 +
 +			codec {
 +				sound-dai = <&hdmi_tx>;
 +			};
 +		};
-+	};
++	};	
  };
  
  &cec_AO {
-@@ -119,6 +152,14 @@
+@@ -119,6 +148,14 @@
  	hdmi-phandle = <&hdmi_tx>;
  };
  
@@ -289,29 +239,18 @@ index 54954b3..3da3309 100644
 +	status = "okay";
 +};
 +
-+&aiu_i2s_dma {
++&aiu_i2s {
 +	status = "okay";
 +};
 +
  &ethmac {
  	status = "okay";
  	pinctrl-0 = <&eth_rgmii_pins>;
-@@ -181,6 +222,10 @@
- 	pinctrl-names = "default";
- };
- 
-+&i2s_dai {
-+	status = "okay";
-+};
-+
- &ir {
- 	status = "okay";
- 	pinctrl-0 = <&remote_input_ao_pins>;
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
-index ce86226..84eb93b 100644
+index ce862266b9aa..e163e7cd5d5b 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
-@@ -113,6 +113,39 @@
+@@ -113,6 +113,35 @@
  			};
  		};
  	};
@@ -320,38 +259,34 @@ index ce86226..84eb93b 100644
 +		compatible = "simple-audio-card";
 +		simple-audio-card,name = "meson-gx-audio";
 +
-+		assigned-clocks = <&clkc CLKID_MPLL2>,
-+				  <&clkc CLKID_MPLL0>,
-+				  <&clkc CLKID_MPLL1>;
-+		assigned-clock-parents = <0>, <0>, <0>;
-+		assigned-clock-rates = <294912000>,
-+				       <270950400>,
-+				       <393216000>;
-+
 +		simple-audio-card,dai-link@0 {
 +			/* HDMI Output */
 +			format = "i2s";
 +			mclk-fs = <256>;
-+			bitclock-master = <&i2s_dai>;
-+			frame-master = <&i2s_dai>;
++			bitclock-master = <&aiu_i2s>;
++			frame-master = <&aiu_i2s>;
 +
-+			plat {
-+				sound-dai = <&aiu_i2s_dma>;
-+			};
++			assigned-clocks = <&clkc CLKID_MPLL2>,
++					  <&clkc CLKID_MPLL0>,
++					  <&clkc CLKID_MPLL1>;
++			assigned-clock-parents = <0>, <0>, <0>;
++			assigned-clock-rates = <294912000>,
++					       <270950400>,
++					       <393216000>;
 +
 +			cpu {
-+				sound-dai = <&i2s_dai>;
++				sound-dai = <&aiu_i2s>;
 +			};
 +
 +			codec {
 +				sound-dai = <&hdmi_tx>;
 +			};
 +		};
-+	};
++	};	
  };
  
  &cec_AO {
-@@ -122,6 +155,14 @@
+@@ -122,6 +151,14 @@
  	hdmi-phandle = <&hdmi_tx>;
  };
  
@@ -359,29 +294,18 @@ index ce86226..84eb93b 100644
 +	status = "okay";
 +};
 +
-+&aiu_i2s_dma {
++&aiu_i2s {
 +	status = "okay";
 +};
 +
  &cvbs_vdac_port {
  	cvbs_vdac_out: endpoint {
  		remote-endpoint = <&cvbs_connector_in>;
-@@ -140,6 +181,10 @@
- 	};
- };
- 
-+&i2s_dai {
-+	status = "okay";
-+};
-+
- &ir {
- 	status = "okay";
- 	pinctrl-0 = <&remote_input_ao_pins>;
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
-index 70325b2..7d1f172 100644
+index 70325b273bd2..07b5f30cd1f9 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
-@@ -105,6 +105,47 @@
+@@ -105,6 +105,43 @@
  			};
  		};
  	};
@@ -390,27 +314,23 @@ index 70325b2..7d1f172 100644
 +		compatible = "simple-audio-card";
 +		simple-audio-card,name = "meson-gx-audio";
 +
-+		assigned-clocks = <&clkc CLKID_MPLL2>,
-+				  <&clkc CLKID_MPLL0>,
-+				  <&clkc CLKID_MPLL1>;
-+		assigned-clock-parents = <0>, <0>, <0>;
-+		assigned-clock-rates = <294912000>,
-+				       <270950400>,
-+				       <393216000>;
-+
 +		simple-audio-card,dai-link@0 {
 +			/* HDMI Output */
 +			format = "i2s";
 +			mclk-fs = <256>;
-+			bitclock-master = <&i2s_dai>;
-+			frame-master = <&i2s_dai>;
++			bitclock-master = <&aiu_i2s>;
++			frame-master = <&aiu_i2s>;
 +
-+			plat {
-+				sound-dai = <&aiu_i2s_dma>;
-+			};
++			assigned-clocks = <&clkc CLKID_MPLL2>,
++					  <&clkc CLKID_MPLL0>,
++					  <&clkc CLKID_MPLL1>;
++			assigned-clock-parents = <0>, <0>, <0>;
++			assigned-clock-rates = <294912000>,
++					       <270950400>,
++					       <393216000>;
 +
 +			cpu {
-+				sound-dai = <&i2s_dai>;
++				sound-dai = <&aiu_i2s>;
 +			};
 +
 +			codec {
@@ -424,27 +344,16 @@ index 70325b2..7d1f172 100644
 +	status = "okay";
 +};
 +
-+&aiu_i2s_dma {
++&aiu_i2s {
 +	status = "okay";
  };
  
  &cec_AO {
-@@ -159,6 +200,10 @@
- 	};
- };
- 
-+&i2s_dai {
-+	status = "okay";
-+};
-+
- &ir {
- 	status = "okay";
- 	pinctrl-0 = <&remote_input_ao_pins>;
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
-index d32cf38..f053595 100644
+index d32cf3846370..6c3137592f10 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
-@@ -65,6 +65,39 @@
+@@ -65,6 +65,35 @@
  			};
  		};
  	};
@@ -453,27 +362,23 @@ index d32cf38..f053595 100644
 +		compatible = "simple-audio-card";
 +		simple-audio-card,name = "meson-gx-audio";
 +
-+		assigned-clocks = <&clkc CLKID_MPLL2>,
-+				  <&clkc CLKID_MPLL0>,
-+				  <&clkc CLKID_MPLL1>;
-+		assigned-clock-parents = <0>, <0>, <0>;
-+		assigned-clock-rates = <294912000>,
-+				       <270950400>,
-+				       <393216000>;
-+
 +		simple-audio-card,dai-link@0 {
 +			/* HDMI Output */
 +			format = "i2s";
 +			mclk-fs = <256>;
-+			bitclock-master = <&i2s_dai>;
-+			frame-master = <&i2s_dai>;
++			bitclock-master = <&aiu_i2s>;
++			frame-master = <&aiu_i2s>;
 +
-+			plat {
-+				sound-dai = <&aiu_i2s_dma>;
-+			};
++			assigned-clocks = <&clkc CLKID_MPLL2>,
++					  <&clkc CLKID_MPLL0>,
++					  <&clkc CLKID_MPLL1>;
++			assigned-clock-parents = <0>, <0>, <0>;
++			assigned-clock-rates = <294912000>,
++					       <270950400>,
++					       <393216000>;
 +
 +			cpu {
-+				sound-dai = <&i2s_dai>;
++				sound-dai = <&aiu_i2s>;
 +			};
 +
 +			codec {
@@ -484,7 +389,7 @@ index d32cf38..f053595 100644
  };
  
  &cec_AO {
-@@ -74,6 +107,14 @@
+@@ -74,6 +103,14 @@
  	hdmi-phandle = <&hdmi_tx>;
  };
  
@@ -492,29 +397,18 @@ index d32cf38..f053595 100644
 +	status = "okay";
 +};
 +
-+&aiu_i2s_dma {
++&aiu_i2s {
 +	status = "okay";
 +};
 +
  &hdmi_tx {
  	status = "okay";
  	pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
-@@ -86,6 +127,10 @@
- 	};
- };
- 
-+&i2s_dai {
-+	status = "okay";
-+};
-+
- &i2c_A {
- 	status = "okay";
- 	pinctrl-0 = <&i2c_a_pins>;
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
-index f63bceb..f56969e 100644
+index 90a56af967a7..5416ca69502d 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
-@@ -84,6 +84,39 @@
+@@ -84,6 +84,35 @@
  		regulator-always-on;
  	};
  
@@ -522,27 +416,23 @@ index f63bceb..f56969e 100644
 +		compatible = "simple-audio-card";
 +		simple-audio-card,name = "meson-gx-audio";
 +
-+		assigned-clocks = <&clkc CLKID_MPLL2>,
-+				  <&clkc CLKID_MPLL0>,
-+				  <&clkc CLKID_MPLL1>;
-+		assigned-clock-parents = <0>, <0>, <0>;
-+		assigned-clock-rates = <294912000>,
-+				       <270950400>,
-+				       <393216000>;
-+
 +		simple-audio-card,dai-link@0 {
 +			/* HDMI Output */
 +			format = "i2s";
 +			mclk-fs = <256>;
-+			bitclock-master = <&i2s_dai>;
-+			frame-master = <&i2s_dai>;
++			bitclock-master = <&aiu_i2s>;
++			frame-master = <&aiu_i2s>;
 +
-+			plat {
-+				sound-dai = <&aiu_i2s_dma>;
-+			};
++			assigned-clocks = <&clkc CLKID_MPLL2>,
++					  <&clkc CLKID_MPLL0>,
++					  <&clkc CLKID_MPLL1>;
++			assigned-clock-parents = <0>, <0>, <0>;
++			assigned-clock-rates = <294912000>,
++					       <270950400>,
++					       <393216000>;
 +
 +			cpu {
-+				sound-dai = <&i2s_dai>;
++				sound-dai = <&aiu_i2s>;
 +			};
 +
 +			codec {
@@ -554,7 +444,7 @@ index f63bceb..f56969e 100644
  	vcc_3v3: regulator-vcc_3v3 {
  		compatible = "regulator-fixed";
  		regulator-name = "VCC_3V3";
-@@ -130,6 +163,14 @@
+@@ -130,6 +159,14 @@
  	hdmi-phandle = <&hdmi_tx>;
  };
  
@@ -562,29 +452,18 @@ index f63bceb..f56969e 100644
 +	status = "okay";
 +};
 +
-+&aiu_i2s_dma {
++&aiu_i2s {
 +	status = "okay";
 +};
 +
  &cvbs_vdac_port {
  	cvbs_vdac_out: endpoint {
  		remote-endpoint = <&cvbs_connector_in>;
-@@ -151,6 +192,10 @@
- 	pinctrl-names = "default";
- };
- 
-+&i2s_dai {
-+	status = "okay";
-+};
-+
- &hdmi_tx {
- 	status = "okay";
- 	pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts
-index 6739697..e3e777f 100644
+index 6739697be1de..abced63e6288 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts
-@@ -102,6 +102,39 @@
+@@ -102,6 +102,35 @@
  			};
  		};
  	};
@@ -593,27 +472,23 @@ index 6739697..e3e777f 100644
 +		compatible = "simple-audio-card";
 +		simple-audio-card,name = "meson-gx-audio";
 +
-+		assigned-clocks = <&clkc CLKID_MPLL2>,
-+				  <&clkc CLKID_MPLL0>,
-+				  <&clkc CLKID_MPLL1>;
-+		assigned-clock-parents = <0>, <0>, <0>;
-+		assigned-clock-rates = <294912000>,
-+				       <270950400>,
-+				       <393216000>;
-+
 +		simple-audio-card,dai-link@0 {
 +			/* HDMI Output */
 +			format = "i2s";
 +			mclk-fs = <256>;
-+			bitclock-master = <&i2s_dai>;
-+			frame-master = <&i2s_dai>;
++			bitclock-master = <&aiu_i2s>;
++			frame-master = <&aiu_i2s>;
 +
-+			plat {
-+				sound-dai = <&aiu_i2s_dma>;
-+			};
++			assigned-clocks = <&clkc CLKID_MPLL2>,
++					  <&clkc CLKID_MPLL0>,
++					  <&clkc CLKID_MPLL1>;
++			assigned-clock-parents = <0>, <0>, <0>;
++			assigned-clock-rates = <294912000>,
++					       <270950400>,
++					       <393216000>;
 +
 +			cpu {
-+				sound-dai = <&i2s_dai>;
++				sound-dai = <&aiu_i2s>;
 +			};
 +
 +			codec {
@@ -624,7 +499,7 @@ index 6739697..e3e777f 100644
  };
  
  &cec_AO {
-@@ -111,6 +144,14 @@
+@@ -111,6 +140,14 @@
  	hdmi-phandle = <&hdmi_tx>;
  };
  
@@ -632,29 +507,18 @@ index 6739697..e3e777f 100644
 +	status = "okay";
 +};
 +
-+&aiu_i2s_dma {
++&aiu_i2s {
 +	status = "okay";
 +};
 +
  &cvbs_vdac_port {
  	cvbs_vdac_out: endpoint {
  		remote-endpoint = <&cvbs_connector_in>;
-@@ -135,6 +176,10 @@
- 	};
- };
- 
-+&i2s_dai {
-+	status = "okay";
-+};
-+
- &ir {
- 	status = "okay";
- 	pinctrl-0 = <&remote_input_ao_pins>;
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts
-index 5896e8a..f8c66a7 100644
+index 5896e8a5d86b..ce85c927dc34 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts
-@@ -32,6 +32,39 @@
+@@ -32,6 +32,35 @@
  			};
  		};
  	};
@@ -663,27 +527,23 @@ index 5896e8a..f8c66a7 100644
 +		compatible = "simple-audio-card";
 +		simple-audio-card,name = "meson-gx-audio";
 +
-+		assigned-clocks = <&clkc CLKID_MPLL2>,
-+				  <&clkc CLKID_MPLL0>,
-+				  <&clkc CLKID_MPLL1>;
-+		assigned-clock-parents = <0>, <0>, <0>;
-+		assigned-clock-rates = <294912000>,
-+				       <270950400>,
-+				       <393216000>;
-+
 +		simple-audio-card,dai-link@0 {
 +			/* HDMI Output */
 +			format = "i2s";
 +			mclk-fs = <256>;
-+			bitclock-master = <&i2s_dai>;
-+			frame-master = <&i2s_dai>;
++			bitclock-master = <&aiu_i2s>;
++			frame-master = <&aiu_i2s>;
 +
-+			plat {
-+				sound-dai = <&aiu_i2s_dma>;
-+			};
++			assigned-clocks = <&clkc CLKID_MPLL2>,
++					  <&clkc CLKID_MPLL0>,
++					  <&clkc CLKID_MPLL1>;
++			assigned-clock-parents = <0>, <0>, <0>;
++			assigned-clock-rates = <294912000>,
++					       <270950400>,
++					       <393216000>;
 +
 +			cpu {
-+				sound-dai = <&i2s_dai>;
++				sound-dai = <&aiu_i2s>;
 +			};
 +
 +			codec {
@@ -694,7 +554,7 @@ index 5896e8a..f8c66a7 100644
  };
  
  &cec_AO {
-@@ -41,12 +74,24 @@
+@@ -41,6 +70,14 @@
  	hdmi-phandle = <&hdmi_tx>;
  };
  
@@ -702,28 +562,18 @@ index 5896e8a..f8c66a7 100644
 +	status = "okay";
 +};
 +
-+&aiu_i2s_dma {
++&aiu_i2s {
 +	status = "okay";
 +};
 +
  &cvbs_vdac_port {
  	cvbs_vdac_out: endpoint {
  		remote-endpoint = <&cvbs_connector_in>;
- 	};
- };
- 
-+&i2s_dai {
-+	status = "okay";
-+};
-+
- &hdmi_tx {
- 	status = "okay";
- 	pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
-index 313f88f..4fbfa5a 100644
+index 313f88f8759e..f49746c3cc02 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
-@@ -85,6 +85,39 @@
+@@ -85,6 +85,35 @@
  		};
  	};
  
@@ -731,27 +581,23 @@ index 313f88f..4fbfa5a 100644
 +		compatible = "simple-audio-card";
 +		simple-audio-card,name = "meson-gx-audio";
 +
-+		assigned-clocks = <&clkc CLKID_MPLL2>,
-+				  <&clkc CLKID_MPLL0>,
-+				  <&clkc CLKID_MPLL1>;
-+		assigned-clock-parents = <0>, <0>, <0>;
-+		assigned-clock-rates = <294912000>,
-+				       <270950400>,
-+				       <393216000>;
-+
 +		simple-audio-card,dai-link@0 {
 +			/* HDMI Output */
 +			format = "i2s";
 +			mclk-fs = <256>;
-+			bitclock-master = <&i2s_dai>;
-+			frame-master = <&i2s_dai>;
++			bitclock-master = <&aiu_i2s>;
++			frame-master = <&aiu_i2s>;
 +
-+			plat {
-+				sound-dai = <&aiu_i2s_dma>;
-+			};
++			assigned-clocks = <&clkc CLKID_MPLL2>,
++					  <&clkc CLKID_MPLL0>,
++					  <&clkc CLKID_MPLL1>;
++			assigned-clock-parents = <0>, <0>, <0>;
++			assigned-clock-rates = <294912000>,
++					       <270950400>,
++					       <393216000>;
 +
 +			cpu {
-+				sound-dai = <&i2s_dai>;
++				sound-dai = <&aiu_i2s>;
 +			};
 +
 +			codec {
@@ -763,7 +609,7 @@ index 313f88f..4fbfa5a 100644
  	pwmleds {
  		compatible = "pwm-leds";
  
-@@ -205,6 +238,14 @@
+@@ -205,6 +234,14 @@
  	hdmi-phandle = <&hdmi_tx>;
  };
  
@@ -771,29 +617,18 @@ index 313f88f..4fbfa5a 100644
 +	status = "okay";
 +};
 +
-+&aiu_i2s_dma {
++&aiu_i2s {
 +	status = "okay";
 +};
 +
  &cpu0 {
  	#cooling-cells = <2>;
  };
-@@ -279,6 +320,10 @@
- 	};
- };
- 
-+&i2s_dai {
-+	status = "okay";
-+};
-+
- &i2c_A {
- 	status = "okay";
- 	pinctrl-0 = <&i2c_a_pins>;
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
-index f7a1cff..b9c5e64 100644
+index f7a1cffab4a8..de3239e27801 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
-@@ -75,6 +75,39 @@
+@@ -75,6 +75,35 @@
  			};
  		};
  	};
@@ -802,27 +637,23 @@ index f7a1cff..b9c5e64 100644
 +		compatible = "simple-audio-card";
 +		simple-audio-card,name = "meson-gx-audio";
 +
-+		assigned-clocks = <&clkc CLKID_MPLL2>,
-+				  <&clkc CLKID_MPLL0>,
-+				  <&clkc CLKID_MPLL1>;
-+		assigned-clock-parents = <0>, <0>, <0>;
-+		assigned-clock-rates = <294912000>,
-+				       <270950400>,
-+				       <393216000>;
-+
 +		simple-audio-card,dai-link@0 {
 +			/* HDMI Output */
 +			format = "i2s";
 +			mclk-fs = <256>;
-+			bitclock-master = <&i2s_dai>;
-+			frame-master = <&i2s_dai>;
++			bitclock-master = <&aiu_i2s>;
++			frame-master = <&aiu_i2s>;
 +
-+			plat {
-+				sound-dai = <&aiu_i2s_dma>;
-+			};
++			assigned-clocks = <&clkc CLKID_MPLL2>,
++					  <&clkc CLKID_MPLL0>,
++					  <&clkc CLKID_MPLL1>;
++			assigned-clock-parents = <0>, <0>, <0>;
++			assigned-clock-rates = <294912000>,
++					       <270950400>,
++					       <393216000>;
 +
 +			cpu {
-+				sound-dai = <&i2s_dai>;
++				sound-dai = <&aiu_i2s>;
 +			};
 +
 +			codec {
@@ -833,7 +664,7 @@ index f7a1cff..b9c5e64 100644
  };
  
  &cec_AO {
-@@ -84,6 +117,14 @@
+@@ -84,6 +113,14 @@
  	hdmi-phandle = <&hdmi_tx>;
  };
  
@@ -841,21 +672,10 @@ index f7a1cff..b9c5e64 100644
 +	status = "okay";
 +};
 +
-+&aiu_i2s_dma {
++&aiu_i2s {
 +	status = "okay";
 +};
 +
  &cvbs_vdac_port {
  	cvbs_vdac_out: endpoint {
  		remote-endpoint = <&cvbs_connector_in>;
-@@ -129,6 +170,10 @@
- 	};
- };
- 
-+&i2s_dai {
-+	status = "okay";
-+};
-+
- &ir {
- 	status = "okay";
- 	pinctrl-0 = <&remote_input_ao_pins>;

patch/kernel/meson64-dev/0012-drm-bridge-dw-hdmi-Use-AUTO-CTS-setup-mode-when-non-.patch

@@ -1,17 +1,16 @@
-From 68854b3c7771ad5754ad46d42f45f626ca87b4ac Mon Sep 17 00:00:00 2001
+From 6cae25f4c3f9d4f124fceaa0350af3e181e027ea Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Mon, 2 Jul 2018 12:21:55 +0200
 Subject: [PATCH] drm: bridge: dw-hdmi: Use AUTO CTS setup mode when non-AHB
  audio
 
 Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
-
 ---
- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 41 ++++++++++++++++++++-----------
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 41 ++++++++++++++---------
  1 file changed, 26 insertions(+), 15 deletions(-)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index 5971976..1fc1270 100644
+index 5971976284bf..1fc12708dbb5 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -430,8 +430,12 @@ static void hdmi_set_cts_n(struct dw_hdmi *hdmi, unsigned int cts,

patch/kernel/meson64-dev/0013-drm-meson-Use-drm_fbdev_generic_setup.patch

@@ -1,4 +1,4 @@
-From a753ec94679503680fcf86ffad3f3d3eb817c6b9 Mon Sep 17 00:00:00 2001
+From ddcd4ee90eaee9efaebe0ac2f778c5823dc9e3fb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
 Date: Sat, 8 Sep 2018 15:46:33 +0200
 Subject: [PATCH] drm/meson: Use drm_fbdev_generic_setup()
@@ -21,17 +21,16 @@ succeeds probing.
 
 Cc: Neil Armstrong <narmstrong@baylibre.com>
 Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
 ---
  drivers/gpu/drm/meson/meson_drv.c | 19 ++-----------------
  drivers/gpu/drm/meson/meson_drv.h |  1 -
  2 files changed, 2 insertions(+), 18 deletions(-)
 
 diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
-index b55e03d..3997e3e 100644
+index d3443125e661..348b5a198b9d 100644
 --- a/drivers/gpu/drm/meson/meson_drv.c
 +++ b/drivers/gpu/drm/meson/meson_drv.c
-@@ -69,15 +69,7 @@
+@@ -68,15 +68,7 @@
   * - Powering Up HDMI controller and PHY
   */
  
@@ -47,7 +46,7 @@ index b55e03d..3997e3e 100644
  	.atomic_check        = drm_atomic_helper_check,
  	.atomic_commit       = drm_atomic_helper_commit,
  	.fb_create           = drm_gem_fb_create,
-@@ -314,13 +306,6 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
+@@ -282,13 +274,6 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
  
  	drm_mode_config_reset(drm);
  
@@ -61,7 +60,7 @@ index b55e03d..3997e3e 100644
  	drm_kms_helper_poll_init(drm);
  
  	platform_set_drvdata(pdev, priv);
-@@ -329,6 +314,8 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
+@@ -297,6 +282,8 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
  	if (ret)
  		goto free_drm;
  
@@ -70,16 +69,12 @@ index b55e03d..3997e3e 100644
  	return 0;
  
  free_drm:
-@@ -345,7 +332,6 @@ static int meson_drv_bind(struct device *dev)
+@@ -313,11 +300,9 @@ static int meson_drv_bind(struct device *dev)
  static void meson_drv_unbind(struct device *dev)
  {
  	struct drm_device *drm = dev_get_drvdata(dev);
 -	struct meson_drm *priv = drm->dev_private;
  
- 	if (priv->canvas) {
- 		meson_canvas_free(priv->canvas, priv->canvas_id_osd1);
-@@ -356,7 +342,6 @@ static void meson_drv_unbind(struct device *dev)
- 
  	drm_dev_unregister(drm);
  	drm_kms_helper_poll_fini(drm);
 -	drm_fbdev_cma_fini(priv->fbdev);
@@ -87,14 +82,14 @@ index b55e03d..3997e3e 100644
  	drm_dev_put(drm);
  
 diff --git a/drivers/gpu/drm/meson/meson_drv.h b/drivers/gpu/drm/meson/meson_drv.h
-index a955354..4dccf4c 100644
+index 8450d6ac8c9b..aab96260da9f 100644
 --- a/drivers/gpu/drm/meson/meson_drv.h
 +++ b/drivers/gpu/drm/meson/meson_drv.h
-@@ -40,7 +40,6 @@ struct meson_drm {
+@@ -33,7 +33,6 @@ struct meson_drm {
  
  	struct drm_device *drm;
  	struct drm_crtc *crtc;
 -	struct drm_fbdev_cma *fbdev;
  	struct drm_plane *primary_plane;
- 	struct drm_plane *overlay_plane;
  
+ 	/* Components Data */

patch/kernel/meson64-dev/0014-drm-meson-Use-optional-canvas-provider.patch

@@ -1,4 +1,4 @@
-From 21a926d5d6a2973c1a1665482accac7548c1a67d Mon Sep 17 00:00:00 2001
+From b2602089ee83fd653aca9b0593c1278c4e906847 Mon Sep 17 00:00:00 2001
 From: Maxime Jourdan <mjourdan@baylibre.com>
 Date: Mon, 15 Oct 2018 14:37:18 +0200
 Subject: [PATCH] drm/meson: Use optional canvas provider
@@ -10,17 +10,16 @@ If a canvas provider node is detected in DT, use it. Otherwise,
 fall back to what is currently being done.
 
 Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
-
 ---
  drivers/gpu/drm/meson/Kconfig       |  1 +
- drivers/gpu/drm/meson/meson_crtc.c  | 14 +++++++----
- drivers/gpu/drm/meson/meson_drv.c   | 46 +++++++++++++++++++++++--------------
- drivers/gpu/drm/meson/meson_drv.h   |  4 ++++
- drivers/gpu/drm/meson/meson_plane.c |  8 ++++++-
- 5 files changed, 51 insertions(+), 22 deletions(-)
+ drivers/gpu/drm/meson/meson_crtc.c  | 14 ++++++---
+ drivers/gpu/drm/meson/meson_drv.c   | 47 ++++++++++++++++++-----------
+ drivers/gpu/drm/meson/meson_drv.h   |  4 +++
+ drivers/gpu/drm/meson/meson_plane.c |  8 ++++-
+ 5 files changed, 52 insertions(+), 22 deletions(-)
 
 diff --git a/drivers/gpu/drm/meson/Kconfig b/drivers/gpu/drm/meson/Kconfig
-index 02d400b..8929058 100644
+index 02d400b8795c..892905825fea 100644
 --- a/drivers/gpu/drm/meson/Kconfig
 +++ b/drivers/gpu/drm/meson/Kconfig
 @@ -7,6 +7,7 @@ config DRM_MESON
@@ -32,10 +31,10 @@ index 02d400b..8929058 100644
  config DRM_MESON_DW_HDMI
  	tristate "HDMI Synopsys Controller support for Amlogic Meson Display"
 diff --git a/drivers/gpu/drm/meson/meson_crtc.c b/drivers/gpu/drm/meson/meson_crtc.c
-index 7c0bdc8..8744244 100644
+index 191b314f9e9e..434a529745bd 100644
 --- a/drivers/gpu/drm/meson/meson_crtc.c
 +++ b/drivers/gpu/drm/meson/meson_crtc.c
-@@ -197,10 +197,16 @@ void meson_crtc_irq(struct meson_drm *priv)
+@@ -216,10 +216,16 @@ void meson_crtc_irq(struct meson_drm *priv)
  		} else
  			meson_vpp_disable_interlace_vscaler_osd1(priv);
  
@@ -57,10 +56,10 @@ index 7c0bdc8..8744244 100644
  		/* Enable OSD1 */
  		writel_bits_relaxed(VPP_OSD1_POSTBLEND, VPP_OSD1_POSTBLEND,
 diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
-index d344312..b39c38c 100644
+index 348b5a198b9d..3fe6edf79b5c 100644
 --- a/drivers/gpu/drm/meson/meson_drv.c
 +++ b/drivers/gpu/drm/meson/meson_drv.c
-@@ -216,24 +216,33 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
+@@ -208,24 +208,33 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
  		goto free_drm;
  	}
  
@@ -111,18 +110,19 @@ index d344312..b39c38c 100644
  	}
  
  	priv->vsync_irq = platform_get_irq(pdev, 0);
-@@ -315,6 +324,9 @@ static void meson_drv_unbind(struct device *dev)
+@@ -300,6 +309,10 @@ static int meson_drv_bind(struct device *dev)
+ static void meson_drv_unbind(struct device *dev)
+ {
  	struct drm_device *drm = dev_get_drvdata(dev);
- 	struct meson_drm *priv = drm->dev_private;
- 
++	struct meson_drm *priv = drm->dev_private;
++
 +	if (priv->canvas)
 +		meson_canvas_free(priv->canvas, priv->canvas_id_osd1);
-+
+ 
  	drm_dev_unregister(drm);
  	drm_kms_helper_poll_fini(drm);
- 	drm_fbdev_cma_fini(priv->fbdev);
 diff --git a/drivers/gpu/drm/meson/meson_drv.h b/drivers/gpu/drm/meson/meson_drv.h
-index 8450d6ac..728d0ca 100644
+index aab96260da9f..747a996dcbdd 100644
 --- a/drivers/gpu/drm/meson/meson_drv.h
 +++ b/drivers/gpu/drm/meson/meson_drv.h
 @@ -22,6 +22,7 @@
@@ -142,9 +142,9 @@ index 8450d6ac..728d0ca 100644
 +
  	struct drm_device *drm;
  	struct drm_crtc *crtc;
- 	struct drm_fbdev_cma *fbdev;
+ 	struct drm_plane *primary_plane;
 diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c
-index 12c80df..51bec8e 100644
+index 12c80dfcff59..51bec8e98a39 100644
 --- a/drivers/gpu/drm/meson/meson_plane.c
 +++ b/drivers/gpu/drm/meson/meson_plane.c
 @@ -90,6 +90,7 @@ static void meson_plane_atomic_update(struct drm_plane *plane,

patch/kernel/meson64-dev/0015-arm64-dts-meson-gx-Add-canvas-provider-node-to-the-v.patch

@@ -1,4 +1,4 @@
-From 7d3414ae548dd7d6e7caad845322b0dedcf05cb1 Mon Sep 17 00:00:00 2001
+From 9ede98dbd8c291ae77b7668a07006f86b5dd1c74 Mon Sep 17 00:00:00 2001
 From: Maxime Jourdan <mjourdan@baylibre.com>
 Date: Mon, 15 Oct 2018 14:38:24 +0200
 Subject: [PATCH] arm64: dts: meson-gx: Add canvas provider node to the vpu
@@ -6,16 +6,15 @@ Subject: [PATCH] arm64: dts: meson-gx: Add canvas provider node to the vpu
 Allows the vpu driver to optionally use a canvas provider node.
 
 Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
-
 ---
  arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
-index fb64354..5012607 100644
+index bcef1d2f6367..b52d62d07137 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
-@@ -540,6 +540,7 @@
+@@ -528,6 +528,7 @@
  			interrupts = <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>;
  			#address-cells = <1>;
  			#size-cells = <0>;

patch/kernel/meson64-dev/0016-drm-meson-Support-Overlay-plane-for-video-rendering.patch

@@ -1,4 +1,4 @@
-From cfcbd82639be569a7ef6f71e991d7506b5e372ab Mon Sep 17 00:00:00 2001
+From cf684e6cee84fe1dad7b12c8c2bd736f74bba53c Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Thu, 2 Aug 2018 10:00:01 +0200
 Subject: [PATCH] drm/meson: Support Overlay plane for video rendering
@@ -23,25 +23,24 @@ code and rewritten to match the atomic universal plane requirements.
 The video rendering using this overlay plane support has been tested using
 the new Kodi DRM-KMS Prime rendering path along the in-review V4L2 Mem2Mem
 Hardware Video Decoder up to 3840x2160 NV12 frames on various display modes.
-
 ---
  drivers/gpu/drm/meson/Makefile          |   2 +-
  drivers/gpu/drm/meson/meson_canvas.c    |   7 +-
  drivers/gpu/drm/meson/meson_canvas.h    |  11 +-
- drivers/gpu/drm/meson/meson_crtc.c      | 216 +++++++++++-
+ drivers/gpu/drm/meson/meson_crtc.c      | 216 ++++++++-
  drivers/gpu/drm/meson/meson_drv.c       |  29 +-
  drivers/gpu/drm/meson/meson_drv.h       |  52 +++
- drivers/gpu/drm/meson/meson_overlay.c   | 586 ++++++++++++++++++++++++++++++++
+ drivers/gpu/drm/meson/meson_overlay.c   | 586 ++++++++++++++++++++++++
  drivers/gpu/drm/meson/meson_overlay.h   |  14 +
  drivers/gpu/drm/meson/meson_registers.h |   3 +
  drivers/gpu/drm/meson/meson_viu.c       |  15 +
- drivers/gpu/drm/meson/meson_vpp.c       |  44 ++-
+ drivers/gpu/drm/meson/meson_vpp.c       |  44 +-
  11 files changed, 971 insertions(+), 8 deletions(-)
  create mode 100644 drivers/gpu/drm/meson/meson_overlay.c
  create mode 100644 drivers/gpu/drm/meson/meson_overlay.h
 
 diff --git a/drivers/gpu/drm/meson/Makefile b/drivers/gpu/drm/meson/Makefile
-index c5c4cc3..7709f2f 100644
+index c5c4cc362f02..7709f2fbb9f7 100644
 --- a/drivers/gpu/drm/meson/Makefile
 +++ b/drivers/gpu/drm/meson/Makefile
 @@ -1,5 +1,5 @@
@@ -52,7 +51,7 @@ index c5c4cc3..7709f2f 100644
  obj-$(CONFIG_DRM_MESON) += meson-drm.o
  obj-$(CONFIG_DRM_MESON_DW_HDMI) += meson_dw_hdmi.o
 diff --git a/drivers/gpu/drm/meson/meson_canvas.c b/drivers/gpu/drm/meson/meson_canvas.c
-index 08f6073..5de11aa 100644
+index 08f6073d967e..5de11aa7c775 100644
 --- a/drivers/gpu/drm/meson/meson_canvas.c
 +++ b/drivers/gpu/drm/meson/meson_canvas.c
 @@ -39,6 +39,7 @@
@@ -84,7 +83,7 @@ index 08f6073..5de11aa 100644
  	regmap_write(priv->dmc, DMC_CAV_LUT_ADDR,
  			CANVAS_LUT_WR_EN | canvas_index);
 diff --git a/drivers/gpu/drm/meson/meson_canvas.h b/drivers/gpu/drm/meson/meson_canvas.h
-index af1759d..85dbf26 100644
+index af1759da4b27..85dbf26e2826 100644
 --- a/drivers/gpu/drm/meson/meson_canvas.h
 +++ b/drivers/gpu/drm/meson/meson_canvas.h
 @@ -23,6 +23,9 @@
@@ -116,7 +115,7 @@ index af1759d..85dbf26 100644
  
  #endif /* __MESON_CANVAS_H */
 diff --git a/drivers/gpu/drm/meson/meson_crtc.c b/drivers/gpu/drm/meson/meson_crtc.c
-index 8744244..1d9d22c 100644
+index 434a529745bd..631a51391440 100644
 --- a/drivers/gpu/drm/meson/meson_crtc.c
 +++ b/drivers/gpu/drm/meson/meson_crtc.c
 @@ -25,6 +25,7 @@
@@ -127,7 +126,7 @@ index 8744244..1d9d22c 100644
  #include <drm/drmP.h>
  #include <drm/drm_atomic.h>
  #include <drm/drm_atomic_helper.h>
-@@ -98,6 +99,10 @@ static void meson_crtc_atomic_enable(struct drm_crtc *crtc,
+@@ -98,6 +99,10 @@ static void meson_crtc_enable(struct drm_crtc *crtc)
  	writel(crtc_state->mode.hdisplay,
  	       priv->io_base + _REG(VPP_POSTBLEND_H_SIZE));
  
@@ -138,12 +137,14 @@ index 8744244..1d9d22c 100644
  	writel_bits_relaxed(VPP_POSTBLEND_ENABLE, VPP_POSTBLEND_ENABLE,
  			    priv->io_base + _REG(VPP_MISC));
  
-@@ -114,11 +119,17 @@ static void meson_crtc_atomic_disable(struct drm_crtc *crtc,
- 
- 	drm_crtc_vblank_off(crtc);
+@@ -126,13 +131,19 @@ static void meson_crtc_atomic_disable(struct drm_crtc *crtc,
+ 	struct meson_crtc *meson_crtc = to_meson_crtc(crtc);
+ 	struct meson_drm *priv = meson_crtc->priv;
  
 +	DRM_DEBUG_DRIVER("\n");
 +
+ 	drm_crtc_vblank_off(crtc);
+ 
  	priv->viu.osd1_enabled = false;
  	priv->viu.osd1_commit = false;
  
@@ -157,7 +158,7 @@ index 8744244..1d9d22c 100644
  			    priv->io_base + _REG(VPP_MISC));
  
  	if (crtc->state->event && !crtc->state->active) {
-@@ -153,6 +164,7 @@ static void meson_crtc_atomic_flush(struct drm_crtc *crtc,
+@@ -172,6 +183,7 @@ static void meson_crtc_atomic_flush(struct drm_crtc *crtc,
  	struct meson_drm *priv = meson_crtc->priv;
  
  	priv->viu.osd1_commit = true;
@@ -165,7 +166,7 @@ index 8744244..1d9d22c 100644
  }
  
  static const struct drm_crtc_helper_funcs meson_crtc_helper_funcs = {
-@@ -206,7 +218,7 @@ void meson_crtc_irq(struct meson_drm *priv)
+@@ -225,7 +237,7 @@ void meson_crtc_irq(struct meson_drm *priv)
  			meson_canvas_setup(priv, MESON_CANVAS_ID_OSD1,
  				priv->viu.osd1_addr, priv->viu.osd1_stride,
  				priv->viu.osd1_height, MESON_CANVAS_WRAP_NONE,
@@ -174,7 +175,7 @@ index 8744244..1d9d22c 100644
  
  		/* Enable OSD1 */
  		writel_bits_relaxed(VPP_OSD1_POSTBLEND, VPP_OSD1_POSTBLEND,
-@@ -215,6 +227,206 @@ void meson_crtc_irq(struct meson_drm *priv)
+@@ -234,6 +246,206 @@ void meson_crtc_irq(struct meson_drm *priv)
  		priv->viu.osd1_commit = false;
  	}
  
@@ -382,7 +383,7 @@ index 8744244..1d9d22c 100644
  
  	spin_lock_irqsave(&priv->drm->event_lock, flags);
 diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
-index b39c38c..b55e03d 100644
+index 3fe6edf79b5c..3ee4d4a4ecba 100644
 --- a/drivers/gpu/drm/meson/meson_drv.c
 +++ b/drivers/gpu/drm/meson/meson_drv.c
 @@ -41,6 +41,7 @@
@@ -393,7 +394,7 @@ index b39c38c..b55e03d 100644
  #include "meson_crtc.h"
  #include "meson_venc_cvbs.h"
  
-@@ -221,6 +222,24 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
+@@ -213,6 +214,24 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
  		ret = meson_canvas_alloc(priv->canvas, &priv->canvas_id_osd1);
  		if (ret)
  			goto free_drm;
@@ -418,7 +419,7 @@ index b39c38c..b55e03d 100644
  	} else {
  		priv->canvas = NULL;
  
-@@ -281,6 +300,10 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
+@@ -273,6 +292,10 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
  	if (ret)
  		goto free_drm;
  
@@ -429,7 +430,7 @@ index b39c38c..b55e03d 100644
  	ret = meson_crtc_create(priv);
  	if (ret)
  		goto free_drm;
-@@ -324,8 +347,12 @@ static void meson_drv_unbind(struct device *dev)
+@@ -311,8 +334,12 @@ static void meson_drv_unbind(struct device *dev)
  	struct drm_device *drm = dev_get_drvdata(dev);
  	struct meson_drm *priv = drm->dev_private;
  
@@ -444,10 +445,10 @@ index b39c38c..b55e03d 100644
  	drm_dev_unregister(drm);
  	drm_kms_helper_poll_fini(drm);
 diff --git a/drivers/gpu/drm/meson/meson_drv.h b/drivers/gpu/drm/meson/meson_drv.h
-index 728d0ca..c971557 100644
+index 747a996dcbdd..83e73491039a 100644
 --- a/drivers/gpu/drm/meson/meson_drv.h
 +++ b/drivers/gpu/drm/meson/meson_drv.h
-@@ -34,11 +34,15 @@ struct meson_drm {
+@@ -34,10 +34,14 @@ struct meson_drm {
  
  	struct meson_canvas *canvas;
  	u8 canvas_id_osd1;
@@ -457,13 +458,12 @@ index 728d0ca..c971557 100644
  
  	struct drm_device *drm;
  	struct drm_crtc *crtc;
- 	struct drm_fbdev_cma *fbdev;
  	struct drm_plane *primary_plane;
 +	struct drm_plane *overlay_plane;
  
  	/* Components Data */
  	struct {
-@@ -50,6 +54,54 @@ struct meson_drm {
+@@ -49,6 +53,54 @@ struct meson_drm {
  		uint32_t osd1_addr;
  		uint32_t osd1_stride;
  		uint32_t osd1_height;
@@ -520,7 +520,7 @@ index 728d0ca..c971557 100644
  	struct {
 diff --git a/drivers/gpu/drm/meson/meson_overlay.c b/drivers/gpu/drm/meson/meson_overlay.c
 new file mode 100644
-index 0000000..9aebc5e
+index 000000000000..9aebc5e4b418
 --- /dev/null
 +++ b/drivers/gpu/drm/meson/meson_overlay.c
 @@ -0,0 +1,586 @@
@@ -1112,7 +1112,7 @@ index 0000000..9aebc5e
 +}
 diff --git a/drivers/gpu/drm/meson/meson_overlay.h b/drivers/gpu/drm/meson/meson_overlay.h
 new file mode 100644
-index 0000000..dae24f5
+index 000000000000..dae24f5ac63d
 --- /dev/null
 +++ b/drivers/gpu/drm/meson/meson_overlay.h
 @@ -0,0 +1,14 @@
@@ -1131,7 +1131,7 @@ index 0000000..dae24f5
 +
 +#endif /* __MESON_OVERLAY_H */
 diff --git a/drivers/gpu/drm/meson/meson_registers.h b/drivers/gpu/drm/meson/meson_registers.h
-index bca8714..5c7e02c 100644
+index bca87143e548..5c7e02c703bc 100644
 --- a/drivers/gpu/drm/meson/meson_registers.h
 +++ b/drivers/gpu/drm/meson/meson_registers.h
 @@ -286,6 +286,7 @@
@@ -1159,7 +1159,7 @@ index bca8714..5c7e02c 100644
  #define VPP_FIFO_STATUS 0x1d28
  #define VPP_SMOKE_CTRL 0x1d29
 diff --git a/drivers/gpu/drm/meson/meson_viu.c b/drivers/gpu/drm/meson/meson_viu.c
-index 6bcfa52..2dffb98 100644
+index 26a0857878bf..90d9ae3c2b81 100644
 --- a/drivers/gpu/drm/meson/meson_viu.c
 +++ b/drivers/gpu/drm/meson/meson_viu.c
 @@ -329,6 +329,21 @@ void meson_viu_init(struct meson_drm *priv)
@@ -1185,7 +1185,7 @@ index 6bcfa52..2dffb98 100644
  	priv->viu.osd1_commit = false;
  	priv->viu.osd1_interlace = false;
 diff --git a/drivers/gpu/drm/meson/meson_vpp.c b/drivers/gpu/drm/meson/meson_vpp.c
-index 27356f8..5dc24a9 100644
+index 27356f81a0ab..5dc24a99e978 100644
 --- a/drivers/gpu/drm/meson/meson_vpp.c
 +++ b/drivers/gpu/drm/meson/meson_vpp.c
 @@ -122,6 +122,31 @@ static void meson_vpp_write_scaling_filter_coefs(struct meson_drm *priv,

patch/kernel/meson64-dev/0017-drm-meson-move-OSD-scaler-management-into-plane-atom.patch

@@ -1,4 +1,4 @@
-From b92e7773bdb2d5c86091cbb2d03cc55ec6365115 Mon Sep 17 00:00:00 2001
+From e79ea0fbd040b03b2c58fe92fefe5e90a4ae586a Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Mon, 29 Oct 2018 17:04:05 +0100
 Subject: [PATCH] drm/meson: move OSD scaler management into plane atomic
@@ -8,19 +8,18 @@ In preparation to support the Primary Plane scaling, move the basic
 OSD Interlace-Only scaler setup code into the primary plane atomic
 update callback and handle the vsync scaler update like the overlay
 plane scaling registers update.
-
 ---
- drivers/gpu/drm/meson/meson_crtc.c  | 35 ++++++++++++++++------------
- drivers/gpu/drm/meson/meson_drv.h   | 10 ++++++++
- drivers/gpu/drm/meson/meson_plane.c | 39 ++++++++++++++++++++++++++++++-
- drivers/gpu/drm/meson/meson_vpp.c   | 46 -------------------------------------
+ drivers/gpu/drm/meson/meson_crtc.c  | 35 ++++++++++++----------
+ drivers/gpu/drm/meson/meson_drv.h   | 10 +++++++
+ drivers/gpu/drm/meson/meson_plane.c | 39 +++++++++++++++++++++++-
+ drivers/gpu/drm/meson/meson_vpp.c   | 46 -----------------------------
  4 files changed, 68 insertions(+), 62 deletions(-)
 
 diff --git a/drivers/gpu/drm/meson/meson_crtc.c b/drivers/gpu/drm/meson/meson_crtc.c
-index 1d9d22c..6099997 100644
+index 631a51391440..75d97f1b2e8f 100644
 --- a/drivers/gpu/drm/meson/meson_crtc.c
 +++ b/drivers/gpu/drm/meson/meson_crtc.c
-@@ -193,21 +193,26 @@ void meson_crtc_irq(struct meson_drm *priv)
+@@ -212,21 +212,26 @@ void meson_crtc_irq(struct meson_drm *priv)
  				priv->io_base + _REG(VIU_OSD1_BLK0_CFG_W3));
  		writel_relaxed(priv->viu.osd1_blk0_cfg[4],
  				priv->io_base + _REG(VIU_OSD1_BLK0_CFG_W4));
@@ -63,10 +62,10 @@ index 1d9d22c..6099997 100644
  		if (priv->canvas)
  			meson_canvas_config(priv->canvas, priv->canvas_id_osd1,
 diff --git a/drivers/gpu/drm/meson/meson_drv.h b/drivers/gpu/drm/meson/meson_drv.h
-index c971557..a955354 100644
+index 83e73491039a..4dccf4cd042a 100644
 --- a/drivers/gpu/drm/meson/meson_drv.h
 +++ b/drivers/gpu/drm/meson/meson_drv.h
-@@ -54,6 +54,16 @@ struct meson_drm {
+@@ -53,6 +53,16 @@ struct meson_drm {
  		uint32_t osd1_addr;
  		uint32_t osd1_stride;
  		uint32_t osd1_height;
@@ -84,7 +83,7 @@ index c971557..a955354 100644
  		bool vd1_enabled;
  		bool vd1_commit;
 diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c
-index 51bec8e..f915a79 100644
+index 51bec8e98a39..f915a79ae81c 100644
 --- a/drivers/gpu/drm/meson/meson_plane.c
 +++ b/drivers/gpu/drm/meson/meson_plane.c
 @@ -143,13 +143,50 @@ static void meson_plane_atomic_update(struct drm_plane *plane,
@@ -140,7 +139,7 @@ index 51bec8e..f915a79 100644
  	/*
  	 * The format of these registers is (x2 << 16 | x1),
 diff --git a/drivers/gpu/drm/meson/meson_vpp.c b/drivers/gpu/drm/meson/meson_vpp.c
-index 5dc24a9..f9efb43 100644
+index 5dc24a99e978..f9efb431e953 100644
 --- a/drivers/gpu/drm/meson/meson_vpp.c
 +++ b/drivers/gpu/drm/meson/meson_vpp.c
 @@ -51,52 +51,6 @@ void meson_vpp_setup_mux(struct meson_drm *priv, unsigned int mux)

patch/kernel/meson64-dev/0018-drm-meson-Add-primary-plane-scaling.patch

@@ -1,4 +1,4 @@
-From 7489078416fdb581625f99ec87b828c2e22794ee Mon Sep 17 00:00:00 2001
+From 73b48fb586af15ca3f1dd3a8e90a4f93bee28ea4 Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Tue, 30 Oct 2018 14:29:10 +0100
 Subject: [PATCH] drm/meson: Add primary plane scaling
@@ -19,13 +19,12 @@ at 1920x1080 and upscaled to 3840x2160 in hardware.
 
 The primary plane atomic check still allow 1:1 scaling, allowing native
 3840x2160 if needed by user-space applications.
-
 ---
- drivers/gpu/drm/meson/meson_plane.c | 186 +++++++++++++++++++++++++++---------
+ drivers/gpu/drm/meson/meson_plane.c | 186 +++++++++++++++++++++-------
  1 file changed, 141 insertions(+), 45 deletions(-)
 
 diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c
-index f915a79..12a47b4 100644
+index f915a79ae81c..12a47b4f65a5 100644
 --- a/drivers/gpu/drm/meson/meson_plane.c
 +++ b/drivers/gpu/drm/meson/meson_plane.c
 @@ -24,6 +24,7 @@

patch/kernel/meson64-dev/0019-drm-meson-Add-HDMI-1.4-4k-modes.patch

@@ -1,4 +1,4 @@
-From 24b38ca3bd2579d4bac18f57526c93bc63354959 Mon Sep 17 00:00:00 2001
+From d6946ffb806bd143f56e1b8251574e52a72d174e Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Fri, 20 Jul 2018 15:29:18 +0200
 Subject: [PATCH] drm/meson: Add HDMI 1.4 4k modes
@@ -11,13 +11,12 @@ Add the timings for the HDMI 1.4 4K modes support :
 Since the 297000Hz pixel clock is already managed and the modes are
 compatible with the HDMI 1.4 current HDMI PHY+Controller support, only
 the missing timings values needs to be added.
-
 ---
- drivers/gpu/drm/meson/meson_venc.c | 129 +++++++++++++++++++++++++++++++++++++
+ drivers/gpu/drm/meson/meson_venc.c | 129 +++++++++++++++++++++++++++++
  1 file changed, 129 insertions(+)
 
 diff --git a/drivers/gpu/drm/meson/meson_venc.c b/drivers/gpu/drm/meson/meson_venc.c
-index 14aac66..d68ccbf 100644
+index be76f3d64bf2..0ba04f6813e6 100644
 --- a/drivers/gpu/drm/meson/meson_venc.c
 +++ b/drivers/gpu/drm/meson/meson_venc.c
 @@ -698,6 +698,132 @@ union meson_hdmi_venc_mode meson_hdmi_encp_mode_1080p60 = {
@@ -153,7 +152,7 @@ index 14aac66..d68ccbf 100644
  struct meson_hdmi_venc_vic_mode {
  	unsigned int vic;
  	union meson_hdmi_venc_mode *mode;
-@@ -718,6 +844,9 @@ struct meson_hdmi_venc_vic_mode {
+@@ -719,6 +845,9 @@ struct meson_hdmi_venc_vic_mode {
  	{ 34, &meson_hdmi_encp_mode_1080p30 },
  	{ 31, &meson_hdmi_encp_mode_1080p50 },
  	{ 16, &meson_hdmi_encp_mode_1080p60 },

patch/kernel/meson64-dev/0020-drm-meson-Add-support-for-VIC-alternate-timings.patch

@@ -1,6 +1,6 @@
-From 96c3cc9c6943cb27ee519cafe17cb563c3fcc28d Mon Sep 17 00:00:00 2001
+From 1085ede288f54b468e255b1b223382680ba3a745 Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
-Date: Tue, 6 Nov 2018 11:54:35 +0100
+Date: Mon, 23 Jul 2018 16:34:03 +0200
 Subject: [PATCH] drm/meson: Add support for VIC alternate timings
 
 This change is an attempt to handle the alternate clock for the CEA mode.
@@ -11,17 +11,14 @@ The actual clock generation will be moved to the Common Clock framework once
 all the video clock are handled by the Amlogic Meson SoC clock driver,
 then these alternate timings will be handled in the same time in a cleaner
 fashion.
-
-Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
-
 ---
- drivers/gpu/drm/meson/meson_dw_hdmi.c |  12 +---
- drivers/gpu/drm/meson/meson_vclk.c    | 127 +++++++++++++++++++++++-----------
+ drivers/gpu/drm/meson/meson_dw_hdmi.c |  12 +--
+ drivers/gpu/drm/meson/meson_vclk.c    | 127 +++++++++++++++++---------
  drivers/gpu/drm/meson/meson_vclk.h    |   2 +
  3 files changed, 89 insertions(+), 52 deletions(-)
 
 diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c
-index df7247c..d8c5cc3 100644
+index 2cb2ad26d716..807111ebfdd9 100644
 --- a/drivers/gpu/drm/meson/meson_dw_hdmi.c
 +++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c
 @@ -594,17 +594,7 @@ dw_hdmi_mode_valid(struct drm_connector *connector,
@@ -44,7 +41,7 @@ index df7247c..d8c5cc3 100644
  
  /* Encoder */
 diff --git a/drivers/gpu/drm/meson/meson_vclk.c b/drivers/gpu/drm/meson/meson_vclk.c
-index ae54732..5accceb 100644
+index ae5473257f72..5acccebd026d 100644
 --- a/drivers/gpu/drm/meson/meson_vclk.c
 +++ b/drivers/gpu/drm/meson/meson_vclk.c
 @@ -117,6 +117,8 @@
@@ -314,7 +311,7 @@ index ae54732..5accceb 100644
  }
  EXPORT_SYMBOL_GPL(meson_vclk_setup);
 diff --git a/drivers/gpu/drm/meson/meson_vclk.h b/drivers/gpu/drm/meson/meson_vclk.h
-index 869fa3a..4bd8752 100644
+index 869fa3a3073e..4bd8752da02a 100644
 --- a/drivers/gpu/drm/meson/meson_vclk.h
 +++ b/drivers/gpu/drm/meson/meson_vclk.h
 @@ -32,6 +32,8 @@ enum {

patch/kernel/meson64-dev/0021-drm-meson-Fix-an-Alpha-Primary-Plane-bug-on-Meson-GX.patch

@@ -1,4 +1,4 @@
-From 90c2e40067b0591a1419472da186463f3f84613b Mon Sep 17 00:00:00 2001
+From 4469098317146bb5f54aaeea021d953963c7ff0a Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Thu, 22 Nov 2018 17:27:20 +0100
 Subject: [PATCH] drm/meson: Fix an Alpha Primary Plane bug on Meson GXL/GXM
@@ -15,7 +15,6 @@ depends on the status of the plane, in addition to reload the scaler
 conversion matrix in the same time.
 
 Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
-
 ---
  drivers/gpu/drm/meson/meson_crtc.c  |  1 +
  drivers/gpu/drm/meson/meson_plane.c | 12 ++++++++++++
@@ -24,10 +23,10 @@ Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
  4 files changed, 41 insertions(+)
 
 diff --git a/drivers/gpu/drm/meson/meson_crtc.c b/drivers/gpu/drm/meson/meson_crtc.c
-index f8e260b..5312cce 100644
+index 75d97f1b2e8f..22756e2b7d54 100644
 --- a/drivers/gpu/drm/meson/meson_crtc.c
 +++ b/drivers/gpu/drm/meson/meson_crtc.c
-@@ -202,6 +202,7 @@ void meson_crtc_irq(struct meson_drm *priv)
+@@ -200,6 +200,7 @@ void meson_crtc_irq(struct meson_drm *priv)
  
  	/* Update the OSD registers */
  	if (priv->viu.osd1_enabled && priv->viu.osd1_commit) {
@@ -36,7 +35,7 @@ index f8e260b..5312cce 100644
  				priv->io_base + _REG(VIU_OSD1_CTRL_STAT));
  		writel_relaxed(priv->viu.osd1_blk0_cfg[0],
 diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c
-index 12a47b4..8372288 100644
+index 12a47b4f65a5..837228847675 100644
 --- a/drivers/gpu/drm/meson/meson_plane.c
 +++ b/drivers/gpu/drm/meson/meson_plane.c
 @@ -79,6 +79,7 @@
@@ -73,7 +72,7 @@ index 12a47b4..8372288 100644
  
  static const struct drm_plane_helper_funcs meson_plane_helper_funcs = {
 diff --git a/drivers/gpu/drm/meson/meson_viu.c b/drivers/gpu/drm/meson/meson_viu.c
-index 2dffb98..a41dd6c 100644
+index 90d9ae3c2b81..366f7e523d15 100644
 --- a/drivers/gpu/drm/meson/meson_viu.c
 +++ b/drivers/gpu/drm/meson/meson_viu.c
 @@ -296,6 +296,33 @@ static void meson_viu_load_matrix(struct meson_drm *priv)
@@ -111,7 +110,7 @@ index 2dffb98..a41dd6c 100644
  {
  	uint32_t reg;
 diff --git a/drivers/gpu/drm/meson/meson_viu.h b/drivers/gpu/drm/meson/meson_viu.h
-index 073b191..e4a6e2f 100644
+index 073b1910bd1b..e4a6e2fba8fb 100644
 --- a/drivers/gpu/drm/meson/meson_viu.h
 +++ b/drivers/gpu/drm/meson/meson_viu.h
 @@ -59,6 +59,7 @@

patch/kernel/meson64-dev/0022-drm-bridge-dw-hdmi-Add-SCDC-and-TMDS-Scrambling-supp.patch

@@ -1,4 +1,4 @@
-From 2ffa6ba6e67706f195b1938c5f7e8a385252bd8e Mon Sep 17 00:00:00 2001
+From 147f9cfda19a2b6af572b0f46cf99a2907081993 Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Wed, 14 Nov 2018 16:48:50 +0100
 Subject: [PATCH] drm/bridge: dw-hdmi: Add SCDC and TMDS Scrambling support
@@ -19,15 +19,14 @@ on the Rockchip 4.4 BSP kernel at [1]
 Cc: Nickey Yang <nickey.yang@rock-chips.com>
 Cc: Huicong Xu <xhc@rock-chips.com>
 Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
-
 ---
- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 45 ++++++++++++++++++++++++++++---
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 45 +++++++++++++++++++++--
  drivers/gpu/drm/bridge/synopsys/dw-hdmi.h |  1 +
  include/drm/bridge/dw_hdmi.h              |  1 +
  3 files changed, 44 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index 1fc1270..2a30d83 100644
+index 1fc12708dbb5..2a30d8393477 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -28,6 +28,7 @@
@@ -122,7 +121,7 @@ index 1fc1270..2a30d83 100644
  	hdmi_writeb(hdmi, mode->hdisplay >> 8, HDMI_FC_INHACTV1);
  	hdmi_writeb(hdmi, mode->hdisplay, HDMI_FC_INHACTV0);
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
-index 9d90eb9..3f3c616 100644
+index 9d90eb9c46e5..3f3c616eba97 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
 @@ -255,6 +255,7 @@
@@ -134,7 +133,7 @@ index 9d90eb9..3f3c616 100644
  #define HDMI_FC_GMD_STAT                        0x1100
  #define HDMI_FC_GMD_EN                          0x1101
 diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h
-index ccb5aa8..d7cc5d0 100644
+index ccb5aa8468e0..d7cc5d094270 100644
 --- a/include/drm/bridge/dw_hdmi.h
 +++ b/include/drm/bridge/dw_hdmi.h
 @@ -156,6 +156,7 @@ void dw_hdmi_setup_rx_sense(struct dw_hdmi *hdmi, bool hpd, bool rx_sense);

patch/kernel/meson64-dev/0023-drm-meson-add-HDMI-div40-TMDS-mode.patch

@@ -1,4 +1,4 @@
-From cd02f4b3e7ad491111dbd6e1eccf3db9bbc1bc81 Mon Sep 17 00:00:00 2001
+From 568280d22888db3f038962bb4320cd147df8c3f1 Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Mon, 12 Nov 2018 16:08:13 +0100
 Subject: [PATCH] drm/meson: add HDMI div40 TMDS mode
@@ -6,13 +6,12 @@ Subject: [PATCH] drm/meson: add HDMI div40 TMDS mode
 Add support for TMDS Clock > 3.4GHz for HDMI2.0 display modes.
 
 Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
-
 ---
  drivers/gpu/drm/meson/meson_dw_hdmi.c | 24 ++++++++++++++++++++----
  1 file changed, 20 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c
-index d8c5cc3..118c49e 100644
+index 807111ebfdd9..b8775102b100 100644
 --- a/drivers/gpu/drm/meson/meson_dw_hdmi.c
 +++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c
 @@ -365,7 +365,8 @@ static int dw_hdmi_phy_init(struct dw_hdmi *hdmi, void *data,

patch/kernel/meson64-dev/0024-drm-meson-add-support-for-HDMI2.0-2160p-modes.patch

@@ -1,4 +1,4 @@
-From b48d4a78b2c3dd2db65ac391be3e12e323b6759e Mon Sep 17 00:00:00 2001
+From 74c398ccd926cabcb078b22e10e32386f508289f Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Mon, 12 Nov 2018 16:10:07 +0100
 Subject: [PATCH] drm/meson: add support for HDMI2.0 2160p modes
@@ -8,13 +8,12 @@ operation in the DW-HDMI Controller, we can enable support for the
 HDMI2.0 3840x2160@60/50 RGB444 display modes.
 
 Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
-
 ---
  drivers/gpu/drm/meson/meson_venc.c | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/gpu/drm/meson/meson_venc.c b/drivers/gpu/drm/meson/meson_venc.c
-index 0fbe525..1bcd642 100644
+index 0ba04f6813e6..66d73a932d19 100644
 --- a/drivers/gpu/drm/meson/meson_venc.c
 +++ b/drivers/gpu/drm/meson/meson_venc.c
 @@ -848,6 +848,8 @@ struct meson_hdmi_venc_vic_mode {

patch/kernel/meson64-dev/0025-drm-bridge-dw-hdmi-add-support-for-YUV420-output.patch

@@ -1,4 +1,4 @@
-From 3e7f3ec3de8753faefdeb02ed6d00cc580e6ad52 Mon Sep 17 00:00:00 2001
+From 61eed88a0fdbe9de3a175297f794ed4b218c1074 Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Wed, 14 Nov 2018 17:19:36 +0100
 Subject: [PATCH] drm/bridge: dw-hdmi: add support for YUV420 output
@@ -14,13 +14,12 @@ the Rockchip Linux 4.4 BSP at [1]
 
 Cc: Zheng Yang <zhengyang@rock-chips.com>
 Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
-
 ---
- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 63 ++++++++++++++++++++++++-------
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 63 ++++++++++++++++++-----
  1 file changed, 50 insertions(+), 13 deletions(-)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index 2a30d83..c3e4ed1 100644
+index 2a30d8393477..c3e4ed1e2d1c 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -94,6 +94,7 @@ struct hdmi_vmode {

patch/kernel/meson64-dev/0026-drm-bridge-dw-hdmi-support-dynamically-get-input-out.patch

@@ -1,4 +1,4 @@
-From 2dcf2d31652207dfe20d7606804ca3b763b7f094 Mon Sep 17 00:00:00 2001
+From 66da835bb8d6d6bc439a8f71d5c56b12b0f0f3f0 Mon Sep 17 00:00:00 2001
 From: Zheng Yang <zhengyang@rock-chips.com>
 Date: Tue, 27 Jun 2017 16:22:01 +0800
 Subject: [PATCH] drm/bridge: dw-hdmi: support dynamically get input/out color
@@ -13,14 +13,13 @@ introduce following funstion in plat_data:
 
 Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
 Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
-
 ---
- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 28 +++++++++++++++++++++-------
- include/drm/bridge/dw_hdmi.h              |  5 +++++
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 28 +++++++++++++++++------
+ include/drm/bridge/dw_hdmi.h              |  5 ++++
  2 files changed, 26 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index c3e4ed1..6473df3 100644
+index c3e4ed1e2d1c..6473df3068ce 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -1774,6 +1774,7 @@ static void hdmi_disable_overflow_interrupts(struct dw_hdmi *hdmi)
@@ -85,7 +84,7 @@ index c3e4ed1..6473df3 100644
  	hdmi->hdmi_data.pix_repet_factor = 0;
  	hdmi->hdmi_data.hdcp_enable = 0;
 diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h
-index d7cc5d0..27f9cce 100644
+index d7cc5d094270..27f9cce66b6a 100644
 --- a/include/drm/bridge/dw_hdmi.h
 +++ b/include/drm/bridge/dw_hdmi.h
 @@ -141,6 +141,11 @@ struct dw_hdmi_plat_data {

patch/kernel/meson64-dev/0027-drm-bridge-dw-hdmi-allow-ycbcr420-modes-for-0x200a.patch

@@ -1,4 +1,4 @@
-From 94d815707144fb76f2e6f718a864f10a8d3f6306 Mon Sep 17 00:00:00 2001
+From a85f121a48712cc5c38197cc621cfcd58b936980 Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Wed, 14 Nov 2018 17:39:46 +0100
 Subject: [PATCH] drm/bridge: dw-hdmi: allow ycbcr420 modes for >= 0x200a
@@ -9,14 +9,13 @@ We limit these modes to DW-HDMI IP version >= 0x200a which
 are designed to support HDMI2.0 display modes.
 
 Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
-
 ---
  drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 6 ++++++
  include/drm/bridge/dw_hdmi.h              | 1 +
  2 files changed, 7 insertions(+)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index 6473df3..d10277f 100644
+index 6473df3068ce..d10277f9ef0b 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -2575,6 +2575,12 @@ __dw_hdmi_probe(struct platform_device *pdev,
@@ -33,7 +32,7 @@ index 6473df3..d10277f 100644
  	pdevinfo.parent = dev;
  	pdevinfo.id = PLATFORM_DEVID_AUTO;
 diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h
-index 27f9cce..c04f497a 100644
+index 27f9cce66b6a..c04f497a919b 100644
 --- a/include/drm/bridge/dw_hdmi.h
 +++ b/include/drm/bridge/dw_hdmi.h
 @@ -128,6 +128,7 @@ struct dw_hdmi_plat_data {

patch/kernel/meson64-dev/0028-drm-meson-Add-YUV420-output-support.patch

@@ -1,4 +1,4 @@
-From fb1abdc9ba8015b1a5c2a6c53ffc08fa0676db04 Mon Sep 17 00:00:00 2001
+From 2977b0d822ed7f44d67df89334a5ddce4bd16894 Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Thu, 15 Nov 2018 16:41:23 +0100
 Subject: [PATCH] drm/meson: Add YUV420 output support
@@ -22,18 +22,17 @@ in order to better support these specific uses cases and switch
 to the Common Clock framework for clocks handling in the future.
 
 Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
-
 ---
- drivers/gpu/drm/meson/meson_dw_hdmi.c   | 108 +++++++++++++++++++++++++++-----
- drivers/gpu/drm/meson/meson_vclk.c      |  95 +++++++++++++++++++++-------
- drivers/gpu/drm/meson/meson_vclk.h      |   7 ++-
+ drivers/gpu/drm/meson/meson_dw_hdmi.c   | 108 ++++++++++++++++++++----
+ drivers/gpu/drm/meson/meson_vclk.c      |  95 ++++++++++++++++-----
+ drivers/gpu/drm/meson/meson_vclk.h      |   7 +-
  drivers/gpu/drm/meson/meson_venc.c      |   6 +-
- drivers/gpu/drm/meson/meson_venc.h      |  11 ++++
+ drivers/gpu/drm/meson/meson_venc.h      |  11 +++
  drivers/gpu/drm/meson/meson_venc_cvbs.c |   3 +-
  6 files changed, 184 insertions(+), 46 deletions(-)
 
 diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c
-index 118c49e..0b9ecbf 100644
+index b8775102b100..83360f37d9ce 100644
 --- a/drivers/gpu/drm/meson/meson_dw_hdmi.c
 +++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c
 @@ -141,6 +141,8 @@ struct meson_dw_hdmi {
@@ -233,8 +232,8 @@ index 118c49e..0b9ecbf 100644
  }
  
  static const struct drm_encoder_helper_funcs
-@@ -714,6 +771,20 @@ static const struct regmap_config meson_dw_hdmi_regmap_config = {
- 	.max_register = 0x10000,
+@@ -715,6 +772,20 @@ static const struct regmap_config meson_dw_hdmi_regmap_config = {
+ 	.fast_io = true,
  };
  
 +static unsigned long meson_dw_hdmi_get_in_bus_format(void *data)
@@ -254,7 +253,7 @@ index 118c49e..0b9ecbf 100644
  static bool meson_hdmi_connector_is_available(struct device *dev)
  {
  	struct device_node *ep, *remote;
-@@ -890,6 +961,9 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master,
+@@ -891,6 +962,9 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master,
  	dw_plat_data->phy_data = meson_dw_hdmi;
  	dw_plat_data->input_bus_format = MEDIA_BUS_FMT_YUV8_1X24;
  	dw_plat_data->input_bus_encoding = V4L2_YCBCR_ENC_709;
@@ -265,7 +264,7 @@ index 118c49e..0b9ecbf 100644
  	platform_set_drvdata(pdev, meson_dw_hdmi);
  
 diff --git a/drivers/gpu/drm/meson/meson_vclk.c b/drivers/gpu/drm/meson/meson_vclk.c
-index 5accceb..27c9c5e 100644
+index 5acccebd026d..27c9c5ead234 100644
 --- a/drivers/gpu/drm/meson/meson_vclk.c
 +++ b/drivers/gpu/drm/meson/meson_vclk.c
 @@ -337,12 +337,17 @@ enum {
@@ -495,7 +494,7 @@ index 5accceb..27c9c5e 100644
  		       params[freq].pll_od3, params[freq].vid_pll_div,
  		       params[freq].vclk_div, hdmi_tx_div, venc_div,
 diff --git a/drivers/gpu/drm/meson/meson_vclk.h b/drivers/gpu/drm/meson/meson_vclk.h
-index 4bd8752..c4d19dd 100644
+index 4bd8752da02a..c4d19ddfcd79 100644
 --- a/drivers/gpu/drm/meson/meson_vclk.h
 +++ b/drivers/gpu/drm/meson/meson_vclk.h
 @@ -33,10 +33,11 @@ enum {
@@ -514,7 +513,7 @@ index 4bd8752..c4d19dd 100644
  
  #endif /* __MESON_VCLK_H */
 diff --git a/drivers/gpu/drm/meson/meson_venc.c b/drivers/gpu/drm/meson/meson_venc.c
-index 1bcd642..ab72ddd 100644
+index 66d73a932d19..04956e3b64b1 100644
 --- a/drivers/gpu/drm/meson/meson_venc.c
 +++ b/drivers/gpu/drm/meson/meson_venc.c
 @@ -956,6 +956,8 @@ bool meson_venc_hdmi_venc_repeat(int vic)
@@ -526,7 +525,7 @@ index 1bcd642..ab72ddd 100644
  			      struct drm_display_mode *mode)
  {
  	union meson_hdmi_venc_mode *vmode = NULL;
-@@ -1505,8 +1507,8 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic,
+@@ -1506,8 +1508,8 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic,
  	writel_relaxed((use_enci ? 1 : 2) |
  		       (mode->flags & DRM_MODE_FLAG_PHSYNC ? 1 << 2 : 0) |
  		       (mode->flags & DRM_MODE_FLAG_PVSYNC ? 1 << 3 : 0) |
@@ -538,7 +537,7 @@ index 1bcd642..ab72ddd 100644
  		       priv->io_base + _REG(VPU_HDMI_SETTING));
  
 diff --git a/drivers/gpu/drm/meson/meson_venc.h b/drivers/gpu/drm/meson/meson_venc.h
-index 97eaebb..5580bf3 100644
+index 97eaebbfa0c4..5580bf38e381 100644
 --- a/drivers/gpu/drm/meson/meson_venc.h
 +++ b/drivers/gpu/drm/meson/meson_venc.h
 @@ -33,6 +33,15 @@ enum {
@@ -567,7 +566,7 @@ index 97eaebb..5580bf3 100644
  unsigned int meson_venci_get_field(struct meson_drm *priv);
  
 diff --git a/drivers/gpu/drm/meson/meson_venc_cvbs.c b/drivers/gpu/drm/meson/meson_venc_cvbs.c
-index f7945ba..38a1117 100644
+index f7945bae3b4a..38a1117b1183 100644
 --- a/drivers/gpu/drm/meson/meson_venc_cvbs.c
 +++ b/drivers/gpu/drm/meson/meson_venc_cvbs.c
 @@ -207,7 +207,8 @@ static void meson_venc_cvbs_encoder_mode_set(struct drm_encoder *encoder,

patch/kernel/meson64-dev/0029-drm-meson-Output-in-YUV444-if-sink-supports-it.patch

@@ -1,4 +1,4 @@
-From c9cf1e80259276c3da76bc03ab0aaa9dfac481ae Mon Sep 17 00:00:00 2001
+From c2a2f3e0a1ae2dddb4445d4fad18952d16d6201d Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Sun, 18 Nov 2018 14:06:11 +0100
 Subject: [PATCH] drm/meson: Output in YUV444 if sink supports it
@@ -8,13 +8,12 @@ pixel format depending on the mode and connector info.
 So now, we can output in YUV444, which is the native video pipeline
 format, directly the the HDMI Sink it it's supported, without
 involving the HDMI Controller CSC.
-
 ---
  drivers/gpu/drm/meson/meson_dw_hdmi.c | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c
-index 0b9ecbf..6df124c 100644
+index 83360f37d9ce..1b7092ab1be8 100644
 --- a/drivers/gpu/drm/meson/meson_dw_hdmi.c
 +++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c
 @@ -670,7 +670,10 @@ static int meson_venc_hdmi_encoder_atomic_check(struct drm_encoder *encoder,

patch/kernel/meson64-dev/0030-drm-meson-Fix-atomic-mode-switching-regression.patch

@@ -0,0 +1,109 @@
+From a03e7f5f0a4d7ffaad899b2b608ce9c8726e139a Mon Sep 17 00:00:00 2001
+From: Neil Armstrong <narmstrong@baylibre.com>
+Date: Mon, 14 Jan 2019 16:26:15 +0100
+Subject: [PATCH] drm/meson: Fix atomic mode switching regression
+
+Since commit 2bcd3ecab773 when switching mode from X11 (ubuntu mate for
+example) the display gets blurry, looking like an invalid framebuffer width.
+
+This commit fixed atomic crtc modesetting in a totally wrong way and
+introduced a local unnecessary ->enabled crtc state.
+
+This commit reverts the crctc _begin() and _enable() changes and simply
+adds drm_atomic_helper_commit_tail_rpm as helper.
+
+Reported-by: Tony McKahan <tonymckahan@gmail.com>
+Suggested-by: Daniel Vetter <daniel@ffwll.ch>
+Fixes: 2bcd3ecab773 ("drm/meson: Fixes for drm_crtc_vblank_on/off support")
+Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
+---
+ drivers/gpu/drm/meson/meson_crtc.c | 23 ++---------------------
+ drivers/gpu/drm/meson/meson_drv.c  |  6 ++++++
+ 2 files changed, 8 insertions(+), 21 deletions(-)
+
+diff --git a/drivers/gpu/drm/meson/meson_crtc.c b/drivers/gpu/drm/meson/meson_crtc.c
+index 22756e2b7d54..8c02c3d392de 100644
+--- a/drivers/gpu/drm/meson/meson_crtc.c
++++ b/drivers/gpu/drm/meson/meson_crtc.c
+@@ -46,7 +46,6 @@ struct meson_crtc {
+ 	struct drm_crtc base;
+ 	struct drm_pending_vblank_event *event;
+ 	struct meson_drm *priv;
+-	bool enabled;
+ };
+ #define to_meson_crtc(x) container_of(x, struct meson_crtc, base)
+ 
+@@ -82,7 +81,8 @@ static const struct drm_crtc_funcs meson_crtc_funcs = {
+ 
+ };
+ 
+-static void meson_crtc_enable(struct drm_crtc *crtc)
++static void meson_crtc_atomic_enable(struct drm_crtc *crtc,
++				     struct drm_crtc_state *old_state)
+ {
+ 	struct meson_crtc *meson_crtc = to_meson_crtc(crtc);
+ 	struct drm_crtc_state *crtc_state = crtc->state;
+@@ -108,20 +108,6 @@ static void meson_crtc_enable(struct drm_crtc *crtc)
+ 
+ 	drm_crtc_vblank_on(crtc);
+ 
+-	meson_crtc->enabled = true;
+-}
+-
+-static void meson_crtc_atomic_enable(struct drm_crtc *crtc,
+-				     struct drm_crtc_state *old_state)
+-{
+-	struct meson_crtc *meson_crtc = to_meson_crtc(crtc);
+-	struct meson_drm *priv = meson_crtc->priv;
+-
+-	DRM_DEBUG_DRIVER("\n");
+-
+-	if (!meson_crtc->enabled)
+-		meson_crtc_enable(crtc);
+-
+ 	priv->viu.osd1_enabled = true;
+ }
+ 
+@@ -153,8 +139,6 @@ static void meson_crtc_atomic_disable(struct drm_crtc *crtc,
+ 
+ 		crtc->state->event = NULL;
+ 	}
+-
+-	meson_crtc->enabled = false;
+ }
+ 
+ static void meson_crtc_atomic_begin(struct drm_crtc *crtc,
+@@ -163,9 +147,6 @@ static void meson_crtc_atomic_begin(struct drm_crtc *crtc,
+ 	struct meson_crtc *meson_crtc = to_meson_crtc(crtc);
+ 	unsigned long flags;
+ 
+-	if (crtc->state->enable && !meson_crtc->enabled)
+-		meson_crtc_enable(crtc);
+-
+ 	if (crtc->state->event) {
+ 		WARN_ON(drm_crtc_vblank_get(crtc) != 0);
+ 
+diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
+index 3ee4d4a4ecba..a74d861ddceb 100644
+--- a/drivers/gpu/drm/meson/meson_drv.c
++++ b/drivers/gpu/drm/meson/meson_drv.c
+@@ -75,6 +75,11 @@ static const struct drm_mode_config_funcs meson_mode_config_funcs = {
+ 	.fb_create           = drm_gem_fb_create,
+ };
+ 
++
++static const struct drm_mode_config_helper_funcs meson_mode_config_helpers = {
++	.atomic_commit_tail = drm_atomic_helper_commit_tail_rpm,
++};
++
+ static irqreturn_t meson_irq(int irq, void *arg)
+ {
+ 	struct drm_device *dev = arg;
+@@ -266,6 +271,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
+ 	drm->mode_config.max_width = 3840;
+ 	drm->mode_config.max_height = 2160;
+ 	drm->mode_config.funcs = &meson_mode_config_funcs;
++	drm->mode_config.helper_private	= &meson_mode_config_helpers;
+ 
+ 	/* Hardware Initialization */
+ 

patch/kernel/meson64-dev/0031-arm64-dts-meson-Fix-IRQ-trigger-type-for-macirq.patch

@@ -1,4 +1,4 @@
-From e2c70445f3533e8fa62f8c645713508148f8e4f6 Mon Sep 17 00:00:00 2001
+From 1888f16c17982ea2de200fce7ee5872cd4847139 Mon Sep 17 00:00:00 2001
 From: Carlo Caione <ccaione@baylibre.com>
 Date: Tue, 4 Dec 2018 16:04:46 +0000
 Subject: [PATCH] arm64: dts: meson: Fix IRQ trigger type for macirq
@@ -35,23 +35,23 @@ index 0d9faf1a51ea..a86b89086334 100644
  			status = "disabled";
  		};
 diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
-index c518130e5ce7..81dcbde9e674 100644
+index df017dbd2e57..b1a42e99cb67 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
-@@ -461,7 +461,7 @@
- 			compatible = "amlogic,meson-gxbb-dwmac", "snps,dwmac";
+@@ -143,7 +143,7 @@
+ 			compatible = "amlogic,meson-axg-dwmac", "snps,dwmac";
  			reg = <0x0 0xff3f0000 0x0 0x10000
- 				0x0 0xff634540 0x0 0x8>;
+ 			       0x0 0xff634540 0x0 0x8>;
 -			interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>;
 +			interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
  			interrupt-names = "macirq";
  			clocks = <&clkc CLKID_ETH>,
  				 <&clkc CLKID_FCLK_DIV2>,
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
-index 5d2820ef9a88..d03737acbae1 100644
+index b52d62d07137..8d1beb9039eb 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
-@@ -511,7 +511,7 @@
+@@ -485,7 +485,7 @@
  			compatible = "amlogic,meson-gx-dwmac", "amlogic,meson-gxbb-dwmac", "snps,dwmac";
  			reg = <0x0 0xc9410000 0x0 0x10000
  			       0x0 0xc8834540 0x0 0x4>;

patch/kernel/meson64-dev/0032-pinctrl-meson-gxl-remove-invalid-GPIOX-tsin_a-pins.patch

@@ -1,4 +1,4 @@
-From 90af79faeb239f3a32974d99a2b58d4ce37cd0c1 Mon Sep 17 00:00:00 2001
+From a0b609f0ab7f5f45de63d2cbded7dc67b384fe21 Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Wed, 7 Nov 2018 11:34:47 +0100
 Subject: [PATCH] pinctrl: meson-gxl: remove invalid GPIOX tsin_a pins
@@ -8,13 +8,12 @@ patch completely removes these pins entries until we find out what
 are the correct bits and registers to be used instead.
 
 Fixes: 5a6ae9b80139 ("pinctrl: meson-gxl: add tsin_a pins")
-
 ---
  drivers/pinctrl/meson/pinctrl-meson-gxl.c | 12 ++----------
  1 file changed, 2 insertions(+), 10 deletions(-)
 
 diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
-index 158f618..0c0a501 100644
+index 158f618f1695..0c0a5018102b 100644
 --- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c
 +++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
 @@ -239,13 +239,9 @@ static const unsigned int eth_link_led_pins[]	= { GPIOZ_14 };

patch/kernel/meson64-dev/0033-arm64-dts-meson-gx-Add-hdmi_5v-regulator-as-hdmi-tx-.patch

@@ -1,4 +1,4 @@
-From 6c4496753e3bea38dd4b42266c8402d048bde635 Mon Sep 17 00:00:00 2001
+From 81f8f5bcd8af794d9e2822a1c6cb79114b2f6bba Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Thu, 8 Nov 2018 14:24:38 +0100
 Subject: [PATCH] arm64: dts: meson-gx: Add hdmi_5v regulator as hdmi tx supply
@@ -8,7 +8,6 @@ PHY and enables the HDMI 5V presence loopback for the monitor.
 
 Fixes: b409f625a6d5 ("ARM64: dts: meson-gx: Add HDMI_5V regulator on selected boards")
 Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
-
 ---
  arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi          | 1 +
  arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts   | 1 +
@@ -18,10 +17,10 @@ Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
-index fb9ad6f..774f8af 100644
+index 87ec1c193f12..e91b2968719d 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
-@@ -166,6 +166,7 @@
+@@ -162,6 +162,7 @@
  	status = "okay";
  	pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
  	pinctrl-names = "default";
@@ -30,10 +29,10 @@ index fb9ad6f..774f8af 100644
  
  &hdmi_tx_tmds_port {
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
-index f053595..e5ef9b0 100644
+index 6c3137592f10..a0eec9d165dc 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
-@@ -119,6 +119,7 @@
+@@ -115,6 +115,7 @@
  	status = "okay";
  	pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
  	pinctrl-names = "default";
@@ -42,10 +41,10 @@ index f053595..e5ef9b0 100644
  
  &hdmi_tx_tmds_port {
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
-index f56969e..ca0228e 100644
+index 5416ca69502d..1ceb40404bd3 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
-@@ -200,6 +200,7 @@
+@@ -192,6 +192,7 @@
  	status = "okay";
  	pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
  	pinctrl-names = "default";
@@ -54,10 +53,10 @@ index f56969e..ca0228e 100644
  
  &hdmi_tx_tmds_port {
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts
-index f8c66a7..29c9837 100644
+index ce85c927dc34..1b0ee78d29bd 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts
-@@ -96,6 +96,7 @@
+@@ -88,6 +88,7 @@
  	status = "okay";
  	pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
  	pinctrl-names = "default";
@@ -66,10 +65,10 @@ index f8c66a7..29c9837 100644
  
  &hdmi_tx_tmds_port {
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
-index 4fbfa5a..fe8e726 100644
+index f49746c3cc02..1d3a9a0b0147 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
-@@ -312,6 +312,7 @@
+@@ -308,6 +308,7 @@
  	status = "okay";
  	pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
  	pinctrl-names = "default";

patch/kernel/meson64-dev/0034-arm64-dts-meson-gxl-libretech-cc-fix-GPIO-lines-name.patch

@@ -1,4 +1,4 @@
-From a0d84363005399bb41b3eee556aa813a129bbcdf Mon Sep 17 00:00:00 2001
+From 5957ecfc01ececcb490abf4c7154caaadaf9192c Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Wed, 7 Nov 2018 11:45:47 +0100
 Subject: [PATCH] arm64: dts: meson-gxl-libretech-cc: fix GPIO lines names
@@ -9,16 +9,15 @@ This patch moves the properties to the gpio nodes.
 
 Fixes: 47884c5c746e ("ARM64: dts: meson-gxl-libretech-cc: Add GPIO lines names")
 Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
-
 ---
  arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
-index ca0228e..bb2a8c7 100644
+index 1ceb40404bd3..f812d3106271 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
-@@ -209,7 +209,7 @@
+@@ -201,7 +201,7 @@
  	};
  };
  
@@ -27,7 +26,7 @@ index ca0228e..bb2a8c7 100644
  	gpio-line-names = "UART TX",
  			  "UART RX",
  			  "Blue LED",
-@@ -224,7 +224,7 @@
+@@ -216,7 +216,7 @@
  			  "7J1 Header Pin15";
  };
  

patch/kernel/meson64-dev/0035-arm64-dts-meson-gxbb-nanopi-k2-fix-GPIO-lines-names.patch

@@ -0,0 +1,37 @@
+From 309bd4bfad7c88f74a7c789eb8bcd32ce7f3aad1 Mon Sep 17 00:00:00 2001
+From: Neil Armstrong <narmstrong@baylibre.com>
+Date: Wed, 7 Nov 2018 11:45:48 +0100
+Subject: [PATCH] arm64: dts: meson-gxbb-nanopi-k2: fix GPIO lines names
+
+The gpio line names were set in the pinctrl node instead of the gpio node,
+at the time it was merged, it worked, but was obviously wrong.
+This patch moves the properties to the gpio nodes.
+
+Fixes: 12ada0513d7a ("ARM64: dts: meson-gxbb-nanopi-k2: Add GPIO lines names")
+Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
+---
+ arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
+index d72b5378eead..cb1d8930209e 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
+@@ -228,7 +228,7 @@
+ 	pinctrl-names = "default";
+ };
+ 
+-&pinctrl_aobus {
++&gpio_ao {
+ 	gpio-line-names = "UART TX", "UART RX", "Power Control", "Power Key In",
+ 			  "VCCK En", "CON1 Header Pin31",
+ 			  "I2S Header Pin6", "IR In", "I2S Header Pin7",
+@@ -238,7 +238,7 @@
+ 			  "";
+ };
+ 
+-&pinctrl_periphs {
++&gpio {
+ 	gpio-line-names = /* Bank GPIOZ */
+ 			  "Eth MDIO", "Eth MDC", "Eth RGMII RX Clk",
+ 			  "Eth RX DV", "Eth RX D0", "Eth RX D1", "Eth RX D2",

patch/kernel/meson64-dev/0036-arm64-dts-meson-gxbb-odroidc2-fix-GPIO-lines-names.patch

@@ -1,4 +1,4 @@
-From fe156961d17219329389eee52306a731b8151b49 Mon Sep 17 00:00:00 2001
+From 14466201e92e694b3003ecaec84c21c3a4cf0ffc Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Wed, 7 Nov 2018 11:45:49 +0100
 Subject: [PATCH] arm64: dts: meson-gxbb-odroidc2: fix GPIO lines names
@@ -9,16 +9,15 @@ This patch moves the properties to the gpio nodes.
 
 Fixes: b03c7d6438bb ("ARM64: dts: meson-gxbb-odroidc2: Add GPIO lines names")
 Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
-
 ---
  arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
-index 3da3309..73cc801 100644
+index 7b89a474d460..88b859a20640 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
-@@ -232,7 +232,7 @@
+@@ -224,7 +224,7 @@
  	pinctrl-names = "default";
  };
  
@@ -27,7 +26,7 @@ index 3da3309..73cc801 100644
  	gpio-line-names = "UART TX", "UART RX", "VCCK En", "TF 3V3/1V8 En",
  			  "USB HUB nRESET", "USB OTG Power En",
  			  "J7 Header Pin2", "IR In", "J7 Header Pin4",
-@@ -242,7 +242,7 @@
+@@ -234,7 +234,7 @@
  			  "";
  };
  

patch/kernel/meson64-dev/0037-arm64-dts-meson-gxl-khadas-vim-fix-GPIO-lines-names.patch

@@ -1,4 +1,4 @@
-From 06df453970ccfbd1affb8ecd6ea50808fa132774 Mon Sep 17 00:00:00 2001
+From 4afb31d23de7839ac264743fd52cbd1290686418 Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Wed, 7 Nov 2018 11:45:50 +0100
 Subject: [PATCH] arm64: dts: meson-gxl-khadas-vim: fix GPIO lines names
@@ -9,16 +9,15 @@ This patch moves the properties to the gpio nodes.
 
 Fixes: 60795933b709 ("ARM64: dts: meson-gxl-khadas-vim: Add GPIO lines names")
 Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
-
 ---
  arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
-index e5ef9b0..1a4b3f3 100644
+index a0eec9d165dc..f8851113e8e8 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
-@@ -158,7 +158,7 @@
+@@ -150,7 +150,7 @@
  	linux,rc-map-name = "rc-geekbox";
  };
  
@@ -27,7 +26,7 @@ index e5ef9b0..1a4b3f3 100644
  	gpio-line-names = "UART TX",
  			  "UART RX",
  			  "Power Key In",
-@@ -173,7 +173,7 @@
+@@ -165,7 +165,7 @@
  			  "";
  };
  

patch/kernel/meson64-dev/0038-media-meson-add-v4l2-m2m-video-decoder-driver.patch

@@ -1,4 +1,4 @@
-From 2c28b1d1f1487bf4aecb36986c2d7b73eb8ac94d Mon Sep 17 00:00:00 2001
+From 17b50515e77a9bb09fcc96701cf3784361dc62ae Mon Sep 17 00:00:00 2001
 From: Maxime Jourdan <mjourdan@baylibre.com>
 Date: Wed, 29 Aug 2018 15:17:22 +0200
 Subject: [PATCH] media: meson: add v4l2 m2m video decoder driver
@@ -17,24 +17,23 @@ Supported SoCs are: GXBB (S905), GXL (S905X/W/D), GXM (S912)
 There is also a hardware bitstream parser (ESPARSER) that is handled here.
 
 Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
-
 ---
- drivers/media/platform/Kconfig                    |   10 +
- drivers/media/platform/meson/Makefile             |    1 +
- drivers/media/platform/meson/vdec/Makefile        |    8 +
- drivers/media/platform/meson/vdec/codec_mpeg12.c  |  209 +++++
- drivers/media/platform/meson/vdec/codec_mpeg12.h  |   14 +
- drivers/media/platform/meson/vdec/dos_regs.h      |   98 ++
- drivers/media/platform/meson/vdec/esparser.c      |  322 +++++++
- drivers/media/platform/meson/vdec/esparser.h      |   32 +
- drivers/media/platform/meson/vdec/vdec.c          | 1034 +++++++++++++++++++++
- drivers/media/platform/meson/vdec/vdec.h          |  251 +++++
- drivers/media/platform/meson/vdec/vdec_1.c        |  231 +++++
- drivers/media/platform/meson/vdec/vdec_1.h        |   14 +
- drivers/media/platform/meson/vdec/vdec_helpers.c  |  412 ++++++++
- drivers/media/platform/meson/vdec/vdec_helpers.h  |   48 +
- drivers/media/platform/meson/vdec/vdec_platform.c |  101 ++
- drivers/media/platform/meson/vdec/vdec_platform.h |   30 +
+ drivers/media/platform/Kconfig                |   10 +
+ drivers/media/platform/meson/Makefile         |    1 +
+ drivers/media/platform/meson/vdec/Makefile    |    8 +
+ .../media/platform/meson/vdec/codec_mpeg12.c  |  209 ++++
+ .../media/platform/meson/vdec/codec_mpeg12.h  |   14 +
+ drivers/media/platform/meson/vdec/dos_regs.h  |   98 ++
+ drivers/media/platform/meson/vdec/esparser.c  |  322 +++++
+ drivers/media/platform/meson/vdec/esparser.h  |   32 +
+ drivers/media/platform/meson/vdec/vdec.c      | 1034 +++++++++++++++++
+ drivers/media/platform/meson/vdec/vdec.h      |  251 ++++
+ drivers/media/platform/meson/vdec/vdec_1.c    |  231 ++++
+ drivers/media/platform/meson/vdec/vdec_1.h    |   14 +
+ .../media/platform/meson/vdec/vdec_helpers.c  |  412 +++++++
+ .../media/platform/meson/vdec/vdec_helpers.h  |   48 +
+ .../media/platform/meson/vdec/vdec_platform.c |  101 ++
+ .../media/platform/meson/vdec/vdec_platform.h |   30 +
  16 files changed, 2815 insertions(+)
  create mode 100644 drivers/media/platform/meson/vdec/Makefile
  create mode 100644 drivers/media/platform/meson/vdec/codec_mpeg12.c
@@ -52,10 +51,10 @@ Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
  create mode 100644 drivers/media/platform/meson/vdec/vdec_platform.h
 
 diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
-index 54fe90a..6bffb0c 100644
+index 70c4f6c54881..619a9b57afc6 100644
 --- a/drivers/media/platform/Kconfig
 +++ b/drivers/media/platform/Kconfig
-@@ -482,6 +482,16 @@ config VIDEO_QCOM_VENUS
+@@ -492,6 +492,16 @@ config VIDEO_QCOM_VENUS
  	  on various Qualcomm SoCs.
  	  To compile this driver as a module choose m here.
  
@@ -73,7 +72,7 @@ index 54fe90a..6bffb0c 100644
  
  # TI VIDEO PORT Helper Modules
 diff --git a/drivers/media/platform/meson/Makefile b/drivers/media/platform/meson/Makefile
-index 597beb8..f7c6e10 100644
+index 597beb8f34d1..f7c6e1031f25 100644
 --- a/drivers/media/platform/meson/Makefile
 +++ b/drivers/media/platform/meson/Makefile
 @@ -1 +1,2 @@
@@ -81,7 +80,7 @@ index 597beb8..f7c6e10 100644
 +obj-$(CONFIG_VIDEO_MESON_VDEC)	+= vdec/
 diff --git a/drivers/media/platform/meson/vdec/Makefile b/drivers/media/platform/meson/vdec/Makefile
 new file mode 100644
-index 0000000..6bea129
+index 000000000000..6bea129084b7
 --- /dev/null
 +++ b/drivers/media/platform/meson/vdec/Makefile
 @@ -0,0 +1,8 @@
@@ -95,7 +94,7 @@ index 0000000..6bea129
 +obj-$(CONFIG_VIDEO_MESON_VDEC) += meson-vdec.o
 diff --git a/drivers/media/platform/meson/vdec/codec_mpeg12.c b/drivers/media/platform/meson/vdec/codec_mpeg12.c
 new file mode 100644
-index 0000000..1bd6fb7
+index 000000000000..1bd6fb7d531d
 --- /dev/null
 +++ b/drivers/media/platform/meson/vdec/codec_mpeg12.c
 @@ -0,0 +1,209 @@
@@ -310,7 +309,7 @@ index 0000000..1bd6fb7
 +};
 diff --git a/drivers/media/platform/meson/vdec/codec_mpeg12.h b/drivers/media/platform/meson/vdec/codec_mpeg12.h
 new file mode 100644
-index 0000000..43cab5f
+index 000000000000..43cab5f39ca0
 --- /dev/null
 +++ b/drivers/media/platform/meson/vdec/codec_mpeg12.h
 @@ -0,0 +1,14 @@
@@ -330,7 +329,7 @@ index 0000000..43cab5f
 +#endif
 diff --git a/drivers/media/platform/meson/vdec/dos_regs.h b/drivers/media/platform/meson/vdec/dos_regs.h
 new file mode 100644
-index 0000000..abd8105
+index 000000000000..abd810542dbb
 --- /dev/null
 +++ b/drivers/media/platform/meson/vdec/dos_regs.h
 @@ -0,0 +1,98 @@
@@ -434,7 +433,7 @@ index 0000000..abd8105
 +#endif
 diff --git a/drivers/media/platform/meson/vdec/esparser.c b/drivers/media/platform/meson/vdec/esparser.c
 new file mode 100644
-index 0000000..9498812
+index 000000000000..9498812243ca
 --- /dev/null
 +++ b/drivers/media/platform/meson/vdec/esparser.c
 @@ -0,0 +1,322 @@
@@ -762,7 +761,7 @@ index 0000000..9498812
 +}
 diff --git a/drivers/media/platform/meson/vdec/esparser.h b/drivers/media/platform/meson/vdec/esparser.h
 new file mode 100644
-index 0000000..ff51fe7
+index 000000000000..ff51fe7fda66
 --- /dev/null
 +++ b/drivers/media/platform/meson/vdec/esparser.h
 @@ -0,0 +1,32 @@
@@ -800,7 +799,7 @@ index 0000000..ff51fe7
 +#endif
 diff --git a/drivers/media/platform/meson/vdec/vdec.c b/drivers/media/platform/meson/vdec/vdec.c
 new file mode 100644
-index 0000000..d8db52c
+index 000000000000..d8db52c01fbe
 --- /dev/null
 +++ b/drivers/media/platform/meson/vdec/vdec.c
 @@ -0,0 +1,1034 @@
@@ -1840,7 +1839,7 @@ index 0000000..d8db52c
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/media/platform/meson/vdec/vdec.h b/drivers/media/platform/meson/vdec/vdec.h
 new file mode 100644
-index 0000000..4e8c3f1
+index 000000000000..4e8c3f1742ac
 --- /dev/null
 +++ b/drivers/media/platform/meson/vdec/vdec.h
 @@ -0,0 +1,251 @@
@@ -2097,7 +2096,7 @@ index 0000000..4e8c3f1
 +#endif
 diff --git a/drivers/media/platform/meson/vdec/vdec_1.c b/drivers/media/platform/meson/vdec/vdec_1.c
 new file mode 100644
-index 0000000..88b8bed
+index 000000000000..88b8bed9441e
 --- /dev/null
 +++ b/drivers/media/platform/meson/vdec/vdec_1.c
 @@ -0,0 +1,231 @@
@@ -2334,7 +2333,7 @@ index 0000000..88b8bed
 +};
 diff --git a/drivers/media/platform/meson/vdec/vdec_1.h b/drivers/media/platform/meson/vdec/vdec_1.h
 new file mode 100644
-index 0000000..042d930
+index 000000000000..042d930c40d7
 --- /dev/null
 +++ b/drivers/media/platform/meson/vdec/vdec_1.h
 @@ -0,0 +1,14 @@
@@ -2354,7 +2353,7 @@ index 0000000..042d930
 +#endif
 diff --git a/drivers/media/platform/meson/vdec/vdec_helpers.c b/drivers/media/platform/meson/vdec/vdec_helpers.c
 new file mode 100644
-index 0000000..02090c5
+index 000000000000..02090c5b089e
 --- /dev/null
 +++ b/drivers/media/platform/meson/vdec/vdec_helpers.c
 @@ -0,0 +1,412 @@
@@ -2772,7 +2771,7 @@ index 0000000..02090c5
 +EXPORT_SYMBOL_GPL(amvdec_abort);
 diff --git a/drivers/media/platform/meson/vdec/vdec_helpers.h b/drivers/media/platform/meson/vdec/vdec_helpers.h
 new file mode 100644
-index 0000000..b9250a8
+index 000000000000..b9250a8157c4
 --- /dev/null
 +++ b/drivers/media/platform/meson/vdec/vdec_helpers.h
 @@ -0,0 +1,48 @@
@@ -2826,7 +2825,7 @@ index 0000000..b9250a8
 +#endif
 diff --git a/drivers/media/platform/meson/vdec/vdec_platform.c b/drivers/media/platform/meson/vdec/vdec_platform.c
 new file mode 100644
-index 0000000..46eeb74
+index 000000000000..46eeb7426f54
 --- /dev/null
 +++ b/drivers/media/platform/meson/vdec/vdec_platform.c
 @@ -0,0 +1,101 @@
@@ -2933,7 +2932,7 @@ index 0000000..46eeb74
 +};
 diff --git a/drivers/media/platform/meson/vdec/vdec_platform.h b/drivers/media/platform/meson/vdec/vdec_platform.h
 new file mode 100644
-index 0000000..f602532
+index 000000000000..f6025326db1d
 --- /dev/null
 +++ b/drivers/media/platform/meson/vdec/vdec_platform.h
 @@ -0,0 +1,30 @@

patch/kernel/meson64-dev/0039-MAINTAINERS-Add-meson-video-decoder.patch

@@ -1,4 +1,4 @@
-From a4089c61b05e61349ff10539fc20ee480d44b303 Mon Sep 17 00:00:00 2001
+From b777b6630523705c5e3d8d493a0d7a724791f72b Mon Sep 17 00:00:00 2001
 From: Maxime Jourdan <mjourdan@baylibre.com>
 Date: Tue, 4 Sep 2018 10:07:08 +0200
 Subject: [PATCH] MAINTAINERS: Add meson video decoder
@@ -6,16 +6,15 @@ Subject: [PATCH] MAINTAINERS: Add meson video decoder
 Add an entry for the meson video decoder for amlogic SoCs.
 
 Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
-
 ---
  MAINTAINERS | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 9e9b19e..ede389b 100644
+index f3a5c97e3419..97b642f1ee0a 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -9520,6 +9520,14 @@ F:	drivers/media/platform/meson/ao-cec.c
+@@ -9732,6 +9732,14 @@ F:	drivers/media/platform/meson/ao-cec.c
  F:	Documentation/devicetree/bindings/media/meson-ao-cec.txt
  T:	git git://linuxtv.org/media_tree.git
  

patch/kernel/meson64-dev/0040-arm64-dts-meson-gx-add-vdec-entry.patch

@@ -1,4 +1,4 @@
-From 771e9830bdd1361594a874ded57fe497f443d7dd Mon Sep 17 00:00:00 2001
+From 9c1f69e0eb5a23b62406bc1148ed2999b0af6db9 Mon Sep 17 00:00:00 2001
 From: Maxime Jourdan <mjourdan@baylibre.com>
 Date: Wed, 29 Aug 2018 15:24:02 +0200
 Subject: [PATCH] arm64: dts: meson-gx: add vdec entry
@@ -6,16 +6,15 @@ Subject: [PATCH] arm64: dts: meson-gx: add vdec entry
 Add the video decoder dts entry
 
 Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
-
 ---
  arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
-index 5012607..5d2820e 100644
+index 8d1beb9039eb..b7d91999f22f 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
-@@ -445,6 +445,20 @@
+@@ -433,6 +433,20 @@
  			};
  		};
  

patch/kernel/meson64-dev/0041-arm64-dts-meson-add-vdec-entries.patch

@@ -1,4 +1,4 @@
-From 75863ab0baf29e4b0212a34f9ab7ef2763a38824 Mon Sep 17 00:00:00 2001
+From 2e0010be40299c6520b141f8c4b3956a579248ae Mon Sep 17 00:00:00 2001
 From: Maxime Jourdan <mjourdan@baylibre.com>
 Date: Wed, 29 Aug 2018 15:24:22 +0200
 Subject: [PATCH] arm64: dts: meson: add vdec entries
@@ -6,7 +6,6 @@ Subject: [PATCH] arm64: dts: meson: add vdec entries
 This enables the video decoder for gxbb, gxl and gxm chips
 
 Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
-
 ---
  arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 10 ++++++++++
  arch/arm64/boot/dts/amlogic/meson-gxl.dtsi  | 10 ++++++++++
@@ -14,10 +13,10 @@ Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
  3 files changed, 24 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
-index 2a4d506..96145e4 100644
+index 61c785d598e0..77cddfb8b783 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
-@@ -814,3 +814,13 @@
+@@ -803,3 +803,13 @@
  	power-domains = <&pwrc_vpu>;
  };
  
@@ -32,10 +31,10 @@ index 2a4d506..96145e4 100644
 +	reset-names = "esparser";
 +};
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
-index 9f4b618..6ca93ae 100644
+index d4c697e0ec75..8ccbd65923e7 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
-@@ -814,3 +814,13 @@
+@@ -804,3 +804,13 @@
  	power-domains = <&pwrc_vpu>;
  };
  
@@ -50,7 +49,7 @@ index 9f4b618..6ca93ae 100644
 +	reset-names = "esparser";
 +};
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
-index 247888d..2f35649 100644
+index 247888d68a3a..2f356495be5e 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
 @@ -117,3 +117,7 @@

patch/kernel/meson64-dev/0042-meson-vdec-introduce-controls-and-V4L2_CID_MIN_BUFFE.patch

@@ -1,21 +1,21 @@
-From e36802c6297adb0c560f3a6c1672546eb380c458 Mon Sep 17 00:00:00 2001
+From 2c328003052898d66cbb84cb7fb595302b8e74b1 Mon Sep 17 00:00:00 2001
 From: Maxime Jourdan <mjourdan@baylibre.com>
 Date: Wed, 10 Oct 2018 17:22:27 +0200
 Subject: [PATCH] meson: vdec: introduce controls and
  V4L2_CID_MIN_BUFFERS_FOR_CAPTURE
 
 ---
- drivers/media/platform/meson/vdec/Makefile     |  2 +-
- drivers/media/platform/meson/vdec/vdec.c       |  7 ++++
- drivers/media/platform/meson/vdec/vdec.h       |  2 ++
- drivers/media/platform/meson/vdec/vdec_ctrls.c | 45 ++++++++++++++++++++++++++
- drivers/media/platform/meson/vdec/vdec_ctrls.h |  8 +++++
+ drivers/media/platform/meson/vdec/Makefile    |  2 +-
+ drivers/media/platform/meson/vdec/vdec.c      |  7 +++
+ drivers/media/platform/meson/vdec/vdec.h      |  2 +
+ .../media/platform/meson/vdec/vdec_ctrls.c    | 45 +++++++++++++++++++
+ .../media/platform/meson/vdec/vdec_ctrls.h    |  8 ++++
  5 files changed, 63 insertions(+), 1 deletion(-)
  create mode 100644 drivers/media/platform/meson/vdec/vdec_ctrls.c
  create mode 100644 drivers/media/platform/meson/vdec/vdec_ctrls.h
 
 diff --git a/drivers/media/platform/meson/vdec/Makefile b/drivers/media/platform/meson/vdec/Makefile
-index 6bea129..eba8608 100644
+index 6bea129084b7..eba86083aadb 100644
 --- a/drivers/media/platform/meson/vdec/Makefile
 +++ b/drivers/media/platform/meson/vdec/Makefile
 @@ -1,7 +1,7 @@
@@ -28,7 +28,7 @@ index 6bea129..eba8608 100644
  meson-vdec-objs += codec_mpeg12.o
  
 diff --git a/drivers/media/platform/meson/vdec/vdec.c b/drivers/media/platform/meson/vdec/vdec.c
-index d8db52c..1c5d3e9 100644
+index d8db52c01fbe..1c5d3e912bee 100644
 --- a/drivers/media/platform/meson/vdec/vdec.c
 +++ b/drivers/media/platform/meson/vdec/vdec.c
 @@ -21,6 +21,7 @@
@@ -67,7 +67,7 @@ index d8db52c..1c5d3e9 100644
  	sess->fh.m2m_ctx = sess->m2m_ctx;
  	file->private_data = &sess->fh;
 diff --git a/drivers/media/platform/meson/vdec/vdec.h b/drivers/media/platform/meson/vdec/vdec.h
-index 4e8c3f1..6be7de2 100644
+index 4e8c3f1742ac..6be7de2849b6 100644
 --- a/drivers/media/platform/meson/vdec/vdec.h
 +++ b/drivers/media/platform/meson/vdec/vdec.h
 @@ -203,6 +203,7 @@ struct amvdec_session {
@@ -88,7 +88,7 @@ index 4e8c3f1..6be7de2 100644
  };
 diff --git a/drivers/media/platform/meson/vdec/vdec_ctrls.c b/drivers/media/platform/meson/vdec/vdec_ctrls.c
 new file mode 100644
-index 0000000..cd6dd6d
+index 000000000000..cd6dd6d87172
 --- /dev/null
 +++ b/drivers/media/platform/meson/vdec/vdec_ctrls.c
 @@ -0,0 +1,45 @@
@@ -139,7 +139,7 @@ index 0000000..cd6dd6d
 +EXPORT_SYMBOL_GPL(amvdec_init_ctrls);
 diff --git a/drivers/media/platform/meson/vdec/vdec_ctrls.h b/drivers/media/platform/meson/vdec/vdec_ctrls.h
 new file mode 100644
-index 0000000..4bcc5e6
+index 000000000000..4bcc5e68865c
 --- /dev/null
 +++ b/drivers/media/platform/meson/vdec/vdec_ctrls.h
 @@ -0,0 +1,8 @@

patch/kernel/meson64-dev/0043-clk-meson-gxbb-set-fclk_div3-as-CLK_IS_CRITICAL.patch

@@ -1,42 +0,0 @@
-From 6b98d7c6cd508cfb4a2d4a1e87e192ffcabeda9e Mon Sep 17 00:00:00 2001
-From: Christian Hewitt <christianshewitt@gmail.com>
-Date: Sat, 13 Oct 2018 14:04:46 +0400
-Subject: [PATCH] clk: meson-gxbb: set fclk_div3 as CLK_IS_CRITICAL
-
-On the Khadas VIM2 (GXM) and LePotato (GXL) board there are problems
-with reboot; e.g. a ~60 second delay between issuing reboot and the
-board power cycling (and in some OS configurations reboot will fail
-and require manual power cycling).
-
-Similar to 'commit c987ac6f1f088663b6dad39281071aeb31d450a8 ("clk:
-meson-gxbb: set fclk_div2 as CLK_IS_CRITICAL")' the SCPI Cortex-M4
-Co-Processor seems to depend on FCLK_DIV3 being operational.
-
-Bisect gives 'commit 05f814402d6174369b3b29832cbb5eb5ed287059 ("clk:
-meson: add fdiv clock gates") between 4.16 and 4.16-rc1 as the first
-bad commit. This added support for the missing clock gates before the
-fixed PLL fixed dividers (FCLK_DIVx) and the clock framework which
-disabled all the unused fixed dividers, thus it disabled a critical
-clock path for the SCPI Co-Processor.
-
-This change simply sets the FCLK_DIV3 gate as critical to ensure
-nothing can disable it.
-
-Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
-
----
- drivers/clk/meson/gxbb.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c
-index 6628ffa..01f7615 100644
---- a/drivers/clk/meson/gxbb.c
-+++ b/drivers/clk/meson/gxbb.c
-@@ -513,6 +513,7 @@ static struct clk_fixed_factor gxbb_fclk_div3_div = {
- 		.ops = &clk_fixed_factor_ops,
- 		.parent_names = (const char *[]){ "fixed_pll" },
- 		.num_parents = 1,
-+		.flags = CLK_IS_CRITICAL,
- 	},
- };
- 

patch/kernel/meson64-dev/0043-media-videodev2-add-V4L2_FMT_FLAG_NO_SOURCE_CHANGE.patch

@@ -1,4 +1,4 @@
-From 80f9e75b2fce22552fdf56ade990f3f98567e29e Mon Sep 17 00:00:00 2001
+From 9d91b894b98ef614e1eff6fd58f53adfe57d4f7b Mon Sep 17 00:00:00 2001
 From: Maxime Jourdan <mjourdan@baylibre.com>
 Date: Thu, 4 Oct 2018 15:37:39 +0200
 Subject: [PATCH] media: videodev2: add V4L2_FMT_FLAG_NO_SOURCE_CHANGE
@@ -9,14 +9,13 @@ OUTPUT) formats may not be able to trigger this event.
 Add a enum_fmt format flag to tag those specific formats.
 
 Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
-
 ---
  Documentation/media/uapi/v4l/vidioc-enum-fmt.rst | 5 +++++
  include/uapi/linux/videodev2.h                   | 5 +++--
  2 files changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
-index 019c513..e0040b3 100644
+index 019c513df217..e0040b36ac43 100644
 --- a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
 +++ b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
 @@ -116,6 +116,11 @@ one until ``EINVAL`` is returned.
@@ -32,10 +31,10 @@ index 019c513..e0040b3 100644
  
  Return Value
 diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index 1aae2e4..f44bdef 100644
+index 2ba2ad0e23fb..dea6716cdfcc 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
-@@ -733,8 +733,9 @@ struct v4l2_fmtdesc {
+@@ -736,8 +736,9 @@ struct v4l2_fmtdesc {
  	__u32		    reserved[4];
  };
  

patch/kernel/meson64-dev/0044-meson-vdec-allow-subscribing-to-V4L2_EVENT_SOURCE_CH.patch

@@ -1,20 +1,19 @@
-From 4ba289cf4940b6b8ddf1e332fc7248a27f54cfc8 Mon Sep 17 00:00:00 2001
+From 91f313a0eab47afc9c09b629cee6eec19911c161 Mon Sep 17 00:00:00 2001
 From: Maxime Jourdan <mjourdan@baylibre.com>
 Date: Wed, 10 Oct 2018 15:44:56 +0200
 Subject: [PATCH] meson: vdec: allow subscribing to V4L2_EVENT_SOURCE_CHANGE
 
 Flag MPEG1/MPEG2 as NO_SOURCE_CHANGE.
-
 ---
- drivers/media/platform/meson/vdec/vdec.c          | 20 ++++++++++++++--
- drivers/media/platform/meson/vdec/vdec.h          | 13 +++++++++++
- drivers/media/platform/meson/vdec/vdec_helpers.c  | 28 +++++++++++++++++++++++
- drivers/media/platform/meson/vdec/vdec_helpers.h  |  1 +
- drivers/media/platform/meson/vdec/vdec_platform.c |  6 +++++
+ drivers/media/platform/meson/vdec/vdec.c      | 20 +++++++++++--
+ drivers/media/platform/meson/vdec/vdec.h      | 13 +++++++++
+ .../media/platform/meson/vdec/vdec_helpers.c  | 28 +++++++++++++++++++
+ .../media/platform/meson/vdec/vdec_helpers.h  |  1 +
+ .../media/platform/meson/vdec/vdec_platform.c |  6 ++++
  5 files changed, 66 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/media/platform/meson/vdec/vdec.c b/drivers/media/platform/meson/vdec/vdec.c
-index 1c5d3e9..ca64045 100644
+index 1c5d3e912bee..ca6404546eb8 100644
 --- a/drivers/media/platform/meson/vdec/vdec.c
 +++ b/drivers/media/platform/meson/vdec/vdec.c
 @@ -230,7 +230,8 @@ static int vdec_queue_setup(struct vb2_queue *q,
@@ -94,7 +93,7 @@ index 1c5d3e9..ca64045 100644
  		return -EINVAL;
  	}
 diff --git a/drivers/media/platform/meson/vdec/vdec.h b/drivers/media/platform/meson/vdec/vdec.h
-index 6be7de2..8f8ce62 100644
+index 6be7de2849b6..8f8ce629c698 100644
 --- a/drivers/media/platform/meson/vdec/vdec.h
 +++ b/drivers/media/platform/meson/vdec/vdec.h
 @@ -101,6 +101,7 @@ struct amvdec_ops {
@@ -167,7 +166,7 @@ index 6be7de2..8f8ce62 100644
  };
  
 diff --git a/drivers/media/platform/meson/vdec/vdec_helpers.c b/drivers/media/platform/meson/vdec/vdec_helpers.c
-index 02090c5..b982b28 100644
+index 02090c5b089e..b982b2869fd2 100644
 --- a/drivers/media/platform/meson/vdec/vdec_helpers.c
 +++ b/drivers/media/platform/meson/vdec/vdec_helpers.c
 @@ -403,6 +403,34 @@ void amvdec_set_par_from_dar(struct amvdec_session *sess,
@@ -206,7 +205,7 @@ index 02090c5..b982b28 100644
  {
  	dev_info(sess->core->dev, "Aborting decoding session!\n");
 diff --git a/drivers/media/platform/meson/vdec/vdec_helpers.h b/drivers/media/platform/meson/vdec/vdec_helpers.h
-index b9250a8..060799b 100644
+index b9250a8157c4..060799b5e4d4 100644
 --- a/drivers/media/platform/meson/vdec/vdec_helpers.h
 +++ b/drivers/media/platform/meson/vdec/vdec_helpers.h
 @@ -44,5 +44,6 @@ void amvdec_remove_ts(struct amvdec_session *sess, u64 ts);
@@ -217,7 +216,7 @@ index b9250a8..060799b 100644
  void amvdec_abort(struct amvdec_session *sess);
  #endif
 diff --git a/drivers/media/platform/meson/vdec/vdec_platform.c b/drivers/media/platform/meson/vdec/vdec_platform.c
-index 46eeb74..291f1ee 100644
+index 46eeb7426f54..291f1eeb27d9 100644
 --- a/drivers/media/platform/meson/vdec/vdec_platform.c
 +++ b/drivers/media/platform/meson/vdec/vdec_platform.c
 @@ -17,6 +17,7 @@ static const struct amvdec_format vdec_formats_gxbb[] = {

patch/kernel/meson64-dev/0045-media-meson-vdec-add-H.264-decoding-support.patch

@@ -1,21 +1,20 @@
-From a41f52edc3681c11517c4d7ceb374f3189ea3310 Mon Sep 17 00:00:00 2001
+From a4a2c8c72bebcc54e7604b7f6f9dec1b269e3382 Mon Sep 17 00:00:00 2001
 From: Maxime Jourdan <mjourdan@baylibre.com>
 Date: Wed, 29 Aug 2018 15:42:56 +0200
 Subject: [PATCH] media: meson: vdec: add H.264 decoding support
 
 Add support for V4L2_PIX_FMT_H264
-
 ---
- drivers/media/platform/meson/vdec/Makefile        |   2 +-
- drivers/media/platform/meson/vdec/codec_h264.c    | 478 ++++++++++++++++++++++
- drivers/media/platform/meson/vdec/codec_h264.h    |  13 +
- drivers/media/platform/meson/vdec/vdec_platform.c |  31 ++
+ drivers/media/platform/meson/vdec/Makefile    |   2 +-
+ .../media/platform/meson/vdec/codec_h264.c    | 478 ++++++++++++++++++
+ .../media/platform/meson/vdec/codec_h264.h    |  13 +
+ .../media/platform/meson/vdec/vdec_platform.c |  31 ++
  4 files changed, 523 insertions(+), 1 deletion(-)
  create mode 100644 drivers/media/platform/meson/vdec/codec_h264.c
  create mode 100644 drivers/media/platform/meson/vdec/codec_h264.h
 
 diff --git a/drivers/media/platform/meson/vdec/Makefile b/drivers/media/platform/meson/vdec/Makefile
-index eba8608..01dc960 100644
+index eba86083aadb..01dc9603abdd 100644
 --- a/drivers/media/platform/meson/vdec/Makefile
 +++ b/drivers/media/platform/meson/vdec/Makefile
 @@ -3,6 +3,6 @@
@@ -28,7 +27,7 @@ index eba8608..01dc960 100644
  obj-$(CONFIG_VIDEO_MESON_VDEC) += meson-vdec.o
 diff --git a/drivers/media/platform/meson/vdec/codec_h264.c b/drivers/media/platform/meson/vdec/codec_h264.c
 new file mode 100644
-index 0000000..6ac0115
+index 000000000000..6ac0115afaa3
 --- /dev/null
 +++ b/drivers/media/platform/meson/vdec/codec_h264.c
 @@ -0,0 +1,478 @@
@@ -512,7 +511,7 @@ index 0000000..6ac0115
 +};
 diff --git a/drivers/media/platform/meson/vdec/codec_h264.h b/drivers/media/platform/meson/vdec/codec_h264.h
 new file mode 100644
-index 0000000..7a15976
+index 000000000000..7a1597611faf
 --- /dev/null
 +++ b/drivers/media/platform/meson/vdec/codec_h264.h
 @@ -0,0 +1,13 @@
@@ -531,7 +530,7 @@ index 0000000..7a15976
 +#endif
 \ No newline at end of file
 diff --git a/drivers/media/platform/meson/vdec/vdec_platform.c b/drivers/media/platform/meson/vdec/vdec_platform.c
-index 291f1ee..baecf59 100644
+index 291f1eeb27d9..baecf5921d56 100644
 --- a/drivers/media/platform/meson/vdec/vdec_platform.c
 +++ b/drivers/media/platform/meson/vdec/vdec_platform.c
 @@ -9,9 +9,20 @@

patch/kernel/meson64-dev/0046-media-meson-vdec-add-MPEG4-decoding-support.patch

@@ -1,22 +1,21 @@
-From e222a1cf4bd62745407a9404565d76b8a5770f12 Mon Sep 17 00:00:00 2001
+From 0078aba06651c06450fe3358ce75c88a696fd333 Mon Sep 17 00:00:00 2001
 From: Maxime Jourdan <mjourdan@baylibre.com>
 Date: Wed, 29 Aug 2018 16:01:55 +0200
 Subject: [PATCH] media: meson: vdec: add MPEG4 decoding support
 
 Add support for V4L2_PIX_FMT_MPEG4, V4L2_PIX_FMT_XVID and
 V4L2_PIX_FMT_H.263
-
 ---
- drivers/media/platform/meson/vdec/Makefile        |   2 +-
- drivers/media/platform/meson/vdec/codec_mpeg4.c   | 139 ++++++++++++++++++++++
- drivers/media/platform/meson/vdec/codec_mpeg4.h   |  13 ++
- drivers/media/platform/meson/vdec/vdec_platform.c |  91 ++++++++++++++
+ drivers/media/platform/meson/vdec/Makefile    |   2 +-
+ .../media/platform/meson/vdec/codec_mpeg4.c   | 139 ++++++++++++++++++
+ .../media/platform/meson/vdec/codec_mpeg4.h   |  13 ++
+ .../media/platform/meson/vdec/vdec_platform.c |  91 ++++++++++++
  4 files changed, 244 insertions(+), 1 deletion(-)
  create mode 100644 drivers/media/platform/meson/vdec/codec_mpeg4.c
  create mode 100644 drivers/media/platform/meson/vdec/codec_mpeg4.h
 
 diff --git a/drivers/media/platform/meson/vdec/Makefile b/drivers/media/platform/meson/vdec/Makefile
-index 01dc960..bb7a134 100644
+index 01dc9603abdd..bb7a134e2728 100644
 --- a/drivers/media/platform/meson/vdec/Makefile
 +++ b/drivers/media/platform/meson/vdec/Makefile
 @@ -3,6 +3,6 @@
@@ -29,7 +28,7 @@ index 01dc960..bb7a134 100644
  obj-$(CONFIG_VIDEO_MESON_VDEC) += meson-vdec.o
 diff --git a/drivers/media/platform/meson/vdec/codec_mpeg4.c b/drivers/media/platform/meson/vdec/codec_mpeg4.c
 new file mode 100644
-index 0000000..1d574e5
+index 000000000000..1d574e576112
 --- /dev/null
 +++ b/drivers/media/platform/meson/vdec/codec_mpeg4.c
 @@ -0,0 +1,139 @@
@@ -174,7 +173,7 @@ index 0000000..1d574e5
 +};
 diff --git a/drivers/media/platform/meson/vdec/codec_mpeg4.h b/drivers/media/platform/meson/vdec/codec_mpeg4.h
 new file mode 100644
-index 0000000..b91b26413
+index 000000000000..b91b26413185
 --- /dev/null
 +++ b/drivers/media/platform/meson/vdec/codec_mpeg4.h
 @@ -0,0 +1,13 @@
@@ -193,7 +192,7 @@ index 0000000..b91b26413
 +#endif
 \ No newline at end of file
 diff --git a/drivers/media/platform/meson/vdec/vdec_platform.c b/drivers/media/platform/meson/vdec/vdec_platform.c
-index baecf59..80b43fd 100644
+index baecf5921d56..80b43fd5d01f 100644
 --- a/drivers/media/platform/meson/vdec/vdec_platform.c
 +++ b/drivers/media/platform/meson/vdec/vdec_platform.c
 @@ -10,9 +10,40 @@

patch/kernel/meson64-dev/0047-media-meson-vdec-add-MJPEG-decoding-support.patch

@@ -1,21 +1,20 @@
-From 9a662159440cf5e0f55275ef63588e35c91c581e Mon Sep 17 00:00:00 2001
+From e795ad9070631877adb8cfabcf4f7c999acc5dad Mon Sep 17 00:00:00 2001
 From: Maxime Jourdan <mjourdan@baylibre.com>
 Date: Sun, 21 Oct 2018 15:14:27 +0200
 Subject: [PATCH] media: meson: vdec: add MJPEG decoding support
 
 Add support for V4L2_PIX_FMT_MJPEG
-
 ---
- drivers/media/platform/meson/vdec/Makefile        |   2 +-
- drivers/media/platform/meson/vdec/codec_mjpeg.c   | 140 ++++++++++++++++++++++
- drivers/media/platform/meson/vdec/codec_mjpeg.h   |  13 ++
- drivers/media/platform/meson/vdec/vdec_platform.c |  31 +++++
+ drivers/media/platform/meson/vdec/Makefile    |   2 +-
+ .../media/platform/meson/vdec/codec_mjpeg.c   | 140 ++++++++++++++++++
+ .../media/platform/meson/vdec/codec_mjpeg.h   |  13 ++
+ .../media/platform/meson/vdec/vdec_platform.c |  31 ++++
  4 files changed, 185 insertions(+), 1 deletion(-)
  create mode 100644 drivers/media/platform/meson/vdec/codec_mjpeg.c
  create mode 100644 drivers/media/platform/meson/vdec/codec_mjpeg.h
 
 diff --git a/drivers/media/platform/meson/vdec/Makefile b/drivers/media/platform/meson/vdec/Makefile
-index bb7a134..acf07f3 100644
+index bb7a134e2728..acf07f3c3dac 100644
 --- a/drivers/media/platform/meson/vdec/Makefile
 +++ b/drivers/media/platform/meson/vdec/Makefile
 @@ -3,6 +3,6 @@
@@ -28,7 +27,7 @@ index bb7a134..acf07f3 100644
  obj-$(CONFIG_VIDEO_MESON_VDEC) += meson-vdec.o
 diff --git a/drivers/media/platform/meson/vdec/codec_mjpeg.c b/drivers/media/platform/meson/vdec/codec_mjpeg.c
 new file mode 100644
-index 0000000..abea9e3
+index 000000000000..abea9e3f944c
 --- /dev/null
 +++ b/drivers/media/platform/meson/vdec/codec_mjpeg.c
 @@ -0,0 +1,140 @@
@@ -174,7 +173,7 @@ index 0000000..abea9e3
 +};
 diff --git a/drivers/media/platform/meson/vdec/codec_mjpeg.h b/drivers/media/platform/meson/vdec/codec_mjpeg.h
 new file mode 100644
-index 0000000..cc1cf73
+index 000000000000..cc1cf731050d
 --- /dev/null
 +++ b/drivers/media/platform/meson/vdec/codec_mjpeg.h
 @@ -0,0 +1,13 @@
@@ -193,7 +192,7 @@ index 0000000..cc1cf73
 +#endif
 \ No newline at end of file
 diff --git a/drivers/media/platform/meson/vdec/vdec_platform.c b/drivers/media/platform/meson/vdec/vdec_platform.c
-index 80b43fd..61def15 100644
+index 80b43fd5d01f..61def155a5fd 100644
 --- a/drivers/media/platform/meson/vdec/vdec_platform.c
 +++ b/drivers/media/platform/meson/vdec/vdec_platform.c
 @@ -11,9 +11,20 @@

patch/kernel/meson64-dev/1010-fixup-drm-meson-Use-optional-canvas-provider.patch

@@ -1,21 +0,0 @@
-From 07145ad0791209d3782eca4800406e7028e40a24 Mon Sep 17 00:00:00 2001
-From: Neil Armstrong <narmstrong@baylibre.com>
-Date: Wed, 7 Nov 2018 11:24:43 +0100
-Subject: [PATCH] fixup! drm/meson: Use optional canvas provider
-
----
- drivers/gpu/drm/meson/meson_drv.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
-index 3997e3e..3ee4d4a4e 100644
---- a/drivers/gpu/drm/meson/meson_drv.c
-+++ b/drivers/gpu/drm/meson/meson_drv.c
-@@ -332,6 +332,7 @@ static int meson_drv_bind(struct device *dev)
- static void meson_drv_unbind(struct device *dev)
- {
- 	struct drm_device *drm = dev_get_drvdata(dev);
-+	struct meson_drm *priv = drm->dev_private;
- 
- 	if (priv->canvas) {
- 		meson_canvas_free(priv->canvas, priv->canvas_id_osd1);

patch/kernel/meson64-dev/1012-drm-meson-add-support-for-1080p25-mode.patch.disabled

@@ -1,21 +0,0 @@
-From 1f929f36f48f0f957f6c73cec309235243bd42f9 Mon Sep 17 00:00:00 2001
-From: Neil Armstrong <narmstrong@baylibre.com>
-Date: Mon, 12 Nov 2018 16:10:31 +0100
-Subject: [PATCH] drm/meson: add support for 1080p25 mode
-
----
- drivers/gpu/drm/meson/meson_venc.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/gpu/drm/meson/meson_venc.c b/drivers/gpu/drm/meson/meson_venc.c
-index d68ccbf..0fbe525 100644
---- a/drivers/gpu/drm/meson/meson_venc.c
-+++ b/drivers/gpu/drm/meson/meson_venc.c
-@@ -841,6 +841,7 @@ struct meson_hdmi_venc_vic_mode {
- 	{ 5, &meson_hdmi_encp_mode_1080i60 },
- 	{ 20, &meson_hdmi_encp_mode_1080i50 },
- 	{ 32, &meson_hdmi_encp_mode_1080p24 },
-+	{ 33, &meson_hdmi_encp_mode_1080p50 },
- 	{ 34, &meson_hdmi_encp_mode_1080p30 },
- 	{ 31, &meson_hdmi_encp_mode_1080p50 },
- 	{ 16, &meson_hdmi_encp_mode_1080p60 },

patch/kernel/meson64-dev/1024-fix-atomic-modeswitching.patch

@@ -1,67 +0,0 @@
-From b9edb9c9eec654ba57f8da7966e4b1b81a6d7c7b Mon Sep 17 00:00:00 2001
-From: Neil Armstrong <narmstrong@baylibre.com>
-Date: Tue, 8 Jan 2019 16:15:31 +0100
-Subject: [PATCH] drm/meson: Fix atomic mode switching
-
-Since commit 2bcd3ecab773 when switching mode from X11 (ubuntu mate for
-example) the display gets blurry.
-
-This commit fixed atomic crtc mode setting but didn't update the display
-parameters when changing mode, only when starting a mode setting after
-a crtc disable.
-
-This commit setups the crctc parameter in _begin() and _enable() to
-take in account the current ctrc parameters.
-
-Fixes: 2bcd3ecab773 ("drm/meson: Fixes for drm_crtc_vblank_on/off support")
-Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
----
- drivers/gpu/drm/meson/meson_crtc.c | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpu/drm/meson/meson_crtc.c b/drivers/gpu/drm/meson/meson_crtc.c
-index 191b314f9e9e5..a71c0e64f1424 100644
---- a/drivers/gpu/drm/meson/meson_crtc.c
-+++ b/drivers/gpu/drm/meson/meson_crtc.c
-@@ -81,14 +81,12 @@ static const struct drm_crtc_funcs meson_crtc_funcs = {
- 
- };
- 
--static void meson_crtc_enable(struct drm_crtc *crtc)
-+static void meson_crtc_setup(struct drm_crtc *crtc)
- {
- 	struct meson_crtc *meson_crtc = to_meson_crtc(crtc);
- 	struct drm_crtc_state *crtc_state = crtc->state;
- 	struct meson_drm *priv = meson_crtc->priv;
- 
--	DRM_DEBUG_DRIVER("\n");
--
- 	if (!crtc_state) {
- 		DRM_ERROR("Invalid crtc_state\n");
- 		return;
-@@ -97,6 +95,16 @@ static void meson_crtc_enable(struct drm_crtc *crtc)
- 	/* Enable VPP Postblend */
- 	writel(crtc_state->mode.hdisplay,
- 	       priv->io_base + _REG(VPP_POSTBLEND_H_SIZE));
-+}
-+
-+static void meson_crtc_enable(struct drm_crtc *crtc)
-+{
-+	struct meson_crtc *meson_crtc = to_meson_crtc(crtc);
-+	struct meson_drm *priv = meson_crtc->priv;
-+
-+	DRM_DEBUG_DRIVER("\n");
-+
-+	meson_crtc_setup(crtc);
- 
- 	writel_bits_relaxed(VPP_POSTBLEND_ENABLE, VPP_POSTBLEND_ENABLE,
- 			    priv->io_base + _REG(VPP_MISC));
-@@ -116,6 +124,8 @@ static void meson_crtc_atomic_enable(struct drm_crtc *crtc,
- 
- 	if (!meson_crtc->enabled)
- 		meson_crtc_enable(crtc);
-+	else
-+		meson_crtc_setup(crtc);
- 
- 	priv->viu.osd1_enabled = true;
- }

patch/kernel/meson64-dev/2001-drm-meson-fix-max-mode_config-height-width.patch

@@ -1,33 +0,0 @@
-From a2b8a766c2fb57096c065e539d93f9f4fbd7ace4 Mon Sep 17 00:00:00 2001
-From: Neil Armstrong <narmstrong@baylibre.com>
-Date: Thu, 4 Oct 2018 10:42:43 +0200
-Subject: [PATCH] drm/meson: fix max mode_config height/width
-
-The mode_config max_width/max_height determines the maximum framebuffer
-size the pixel reader can handle. But the values were set thinking they
-were determining the maximum screen dimensions.
-
-This patch changes the values to the maximum height/width the CANVAS block
-can handle rounded to some coherent values.
-
-Fixes: a41e82e6c457 ("drm/meson: Add support for components")
-Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
----
- drivers/gpu/drm/meson/meson_drv.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
-index 3ee4d4a4ecba..b3c04ecc75f3 100644
---- a/drivers/gpu/drm/meson/meson_drv.c
-+++ b/drivers/gpu/drm/meson/meson_drv.c
-@@ -263,8 +263,8 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
- 		goto free_drm;
- 
- 	drm_mode_config_init(drm);
--	drm->mode_config.max_width = 3840;
--	drm->mode_config.max_height = 2160;
-+	drm->mode_config.max_width = 16384;
-+	drm->mode_config.max_height = 8192;
- 	drm->mode_config.funcs = &meson_mode_config_funcs;
- 
- 	/* Hardware Initialization */

patch/kernel/meson64-dev/general-packaging-4.17-dev.patch

@@ -216,6 +216,6 @@ index f839ecd9..cd276162 100644
  boot		:= arch/arm64/boot
 -KBUILD_IMAGE	:= $(boot)/Image.gz
 +KBUILD_IMAGE	:= $(boot)/Image
- KBUILD_DTBS	:= dtbs
 
- all:	Image.gz $(KBUILD_DTBS) 
+ all:	Image.gz $(KBUILD_DTBS) 
+

patch/kernel/meson64-dev/timekeeping32-tweaks-for-4.20.y.patch

@@ -0,0 +1,24 @@
+diff --git a/include/linux/timekeeping32.h b/include/linux/timekeeping32.h
+index a502616..43a3837 100644
+--- a/include/linux/timekeeping32.h
++++ b/include/linux/timekeeping32.h
+@@ -53,6 +53,19 @@ static inline void getboottime(struct timespec *ts)
+ }
+ 
+ /*
++ * Timespec interfaces utilizing the ktime based ones
++ */
++static inline void get_monotonic_boottime(struct timespec *ts)
++{
++	*ts = ktime_to_timespec(ktime_get_boottime());
++}
++
++static inline void timekeeping_clocktai(struct timespec *ts)
++{
++	*ts = ktime_to_timespec(ktime_get_clocktai());
++}
++
++/*
+  * Persistent clock related interfaces
+  */
+ extern void read_persistent_clock(struct timespec *ts);

patch/kernel/sunxi-dev/wifi-3002-add-realtek-8189es.patch

@@ -316957,7 +316957,7 @@ new file mode 100644
 index 0000000..26988ce
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8189es/os_dep/linux/ioctl_cfg80211.c
-@@ -0,0 +1,6787 @@
+@@ -0,0 +1,6788 @@
 +/******************************************************************************
 + *
 + * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved.
@@ -320573,7 +320573,8 @@ index 0000000..26988ce
 +		else // WIFI_REASSOCREQ
 +			ie_offset = _REASOCREQ_IE_OFFSET_;
 +	
-+		sinfo.filled = 0;
++		sinfo.filled = 0;
++		sinfo.pertid = 0;
 +// cf commit 319090bf6c75e3ad42a8c
 +//		sinfo.filled = STATION_INFO_ASSOC_REQ_IES;
 +		sinfo.assoc_req_ies = pmgmt_frame + WLAN_HDR_A3_LEN + ie_offset;

patch/kernel/sunxi-dev/wifi-4002-add-realtek-8723cs.patch

@@ -308434,7 +308434,7 @@ new file mode 100644
 index 00000000..4b44a788
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8723cs/os_dep/linux/ioctl_cfg80211.c
-@@ -0,0 +1,6904 @@
+@@ -0,0 +1,6905 @@
 +/******************************************************************************
 + *
 + * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved.
@@ -312075,6 +312075,7 @@ index 00000000..4b44a788
 +			ie_offset = _REASOCREQ_IE_OFFSET_;
 +	
 +		sinfo.filled = 0;
++		sinfo.pertid = 0;
 +		sinfo.filled = STATION_INFO_ASSOC_REQ_IES;
 +		sinfo.assoc_req_ies = pmgmt_frame + WLAN_HDR_A3_LEN + ie_offset;
 +		sinfo.assoc_req_ies_len = frame_len - WLAN_HDR_A3_LEN - ie_offset;

patch/kernel/sunxi-dev/wifi-add-realtek-8189fs.patch

@@ -357667,7 +357667,7 @@ new file mode 100644
 index 0000000..c942ed6
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8189fs/os_dep/linux/ioctl_cfg80211.c
-@@ -0,0 +1,6916 @@
+@@ -0,0 +1,6917 @@
 +/******************************************************************************
 + *
 + * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved.
@@ -361313,7 +361313,8 @@ index 0000000..c942ed6
 +		else // WIFI_REASSOCREQ
 +			ie_offset = _REASOCREQ_IE_OFFSET_;
 +
-+		sinfo.filled = 0;
++		sinfo.filled = 0;
++		sinfo.pertid = 0;
 +// cf commit 319090bf6c75e3ad42a8c
 +//		sinfo.filled = STATION_INFO_ASSOC_REQ_IES;
 +		sinfo.assoc_req_ies = pmgmt_frame + WLAN_HDR_A3_LEN + ie_offset;

patch/kernel/sunxi-next/ARM-dts-sun7i-Disable-OOB-IRQ-for-brcm-wifi-on-Banana-Pi-M1-plus.patch

@@ -0,0 +1,40 @@
+From 0999574c7b78b85d56ef6ca39684817636773d75 Mon Sep 17 00:00:00 2001
+From: Richard Kojedzinszky <krichy@nmdps.net>
+Date: Sun, 20 Jan 2019 18:43:37 +0100
+Subject: [PATCH] Disable OOB IRQ for wifi on bananapi m1 plus
+
+See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908438
+---
+ arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
+index 763cb03033c4..661b4f90db91 100644
+--- a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
++++ b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
+@@ -203,9 +203,19 @@
+ 	brcmf: wifi@1 {
+ 		reg = <1>;
+ 		compatible = "brcm,bcm4329-fmac";
+-		interrupt-parent = <&pio>;
+-		interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>;
+-		interrupt-names = "host-wake";
++		/*
++		 * OOB interrupt support is broken ATM, often the first irq
++		 * does not get seen resulting in the drv probe failing with:
++		 *
++		 * brcmfmac: brcmf_sdio_bus_rxctl: resumed on timeout
++		 * brcmfmac: brcmf_bus_started: failed: -110
++		 * brcmfmac: brcmf_attach: dongle is not responding: err=-110
++		 * brcmfmac: brcmf_sdio_firmware_callback: brcmf_attach failed
++		 *
++		 * interrupt-parent = <&pio>;
++		 * interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>;
++		 * interrupt-names = "host-wake";
++		 */
+ 	};
+ };
+ 
+-- 
+2.11.0
+

patch/kernel/sunxi-next/wifi-3002-add-realtek-8189es.patch

@@ -316957,7 +316957,7 @@ new file mode 100644
 index 0000000..26988ce
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8189es/os_dep/linux/ioctl_cfg80211.c
-@@ -0,0 +1,6787 @@
+@@ -0,0 +1,6788 @@
 +/******************************************************************************
 + *
 + * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved.
@@ -320573,7 +320573,8 @@ index 0000000..26988ce
 +		else // WIFI_REASSOCREQ
 +			ie_offset = _REASOCREQ_IE_OFFSET_;
 +	
-+		sinfo.filled = 0;
++		sinfo.filled = 0;
++		sinfo.pertid = 0;
 +// cf commit 319090bf6c75e3ad42a8c
 +//		sinfo.filled = STATION_INFO_ASSOC_REQ_IES;
 +		sinfo.assoc_req_ies = pmgmt_frame + WLAN_HDR_A3_LEN + ie_offset;

patch/kernel/sunxi-next/wifi-4002-add-realtek-8723cs.patch

@@ -308434,7 +308434,7 @@ new file mode 100644
 index 00000000..4b44a788
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8723cs/os_dep/linux/ioctl_cfg80211.c
-@@ -0,0 +1,6904 @@
+@@ -0,0 +1,6905 @@
 +/******************************************************************************
 + *
 + * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved.
@@ -312075,6 +312075,7 @@ index 00000000..4b44a788
 +			ie_offset = _REASOCREQ_IE_OFFSET_;
 +	
 +		sinfo.filled = 0;
++		sinfo.pertid = 0;
 +		sinfo.filled = STATION_INFO_ASSOC_REQ_IES;
 +		sinfo.assoc_req_ies = pmgmt_frame + WLAN_HDR_A3_LEN + ie_offset;
 +		sinfo.assoc_req_ies_len = frame_len - WLAN_HDR_A3_LEN - ie_offset;

patch/kernel/sunxi-next/wifi-add-realtek-8189fs.patch

@@ -357667,7 +357667,7 @@ new file mode 100644
 index 0000000..c942ed6
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8189fs/os_dep/linux/ioctl_cfg80211.c
-@@ -0,0 +1,6916 @@
+@@ -0,0 +1,6917 @@
 +/******************************************************************************
 + *
 + * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved.
@@ -361313,7 +361313,8 @@ index 0000000..c942ed6
 +		else // WIFI_REASSOCREQ
 +			ie_offset = _REASOCREQ_IE_OFFSET_;
 +
-+		sinfo.filled = 0;
++		sinfo.filled = 0;
++		sinfo.pertid = 0;
 +// cf commit 319090bf6c75e3ad42a8c
 +//		sinfo.filled = STATION_INFO_ASSOC_REQ_IES;
 +		sinfo.assoc_req_ies = pmgmt_frame + WLAN_HDR_A3_LEN + ie_offset;