Merge pull request #26 from d3adme4t/4.14-hdmi

4.14 hdmi

arch/arm/configs/mt7623n_evb_fwu_defconfig

@@ -2,26 +2,14 @@ CONFIG_LOCALVERSION="-bpi-r2"
 CONFIG_LOCALVERSION_AUTO=n
 
 #spectre/meltdown
-CONFIG_PAGE_TABLE_ISOLATION=y
+#CONFIG_PAGE_TABLE_ISOLATION=y
 
 CONFIG_SYSVIPC=y
 CONFIG_IRQ_DOMAIN_DEBUG=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_CGROUPS=y
 CONFIG_NAMESPACES=y
-
-#for lxc
-CONFIG_USER_NS=y
-CONFIG_MEMCG=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_CPUSETS=y
-#some options for docker
-CONFIG_CGROUP_FREEZER=y
-CONFIG_POSIX_MQUEUE=y
-
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
@@ -59,9 +47,6 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_CMDLINE="earlyprintk console=ttyS0,115200 vmalloc=496M debug=7 no_console_suspend"
 #CONFIG_CMDLINE_FORCE=y
 
-CONFIG_IKCONFIG=m
-CONFIG_IKCONFIG_PROC=y
-
 CONFIG_KEXEC=y
 
 CONFIG_CPU_FREQ=y
@@ -102,14 +87,6 @@ CONFIG_BRIDGE=y
 CONFIG_NET_DSA=y
 CONFIG_VLAN_8021Q=y
 CONFIG_NETLINK_DIAG=y
-CONFIG_INET_UDP_DIAG=m
-CONFIG_NET_IPIP=m
-CONFIG_IP_MULTICAST=y
-
-#added for lxc
-CONFIG_UNIX_DIAG=m
-CONFIG_PACKET_DIAG=m
-
 
 CONFIG_IPV6=m
 CONFIG_NETFILTER=y
@@ -132,40 +109,10 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_MATCH_RT=m
-
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_IP_VS=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-
-#active ftp-support
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_NAT_FTP=m
-
-
-CONFIG_SYN_COOKIES=y
 
 CONFIG_PPP=m
 CONFIG_PPPOE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_MPPE=m
 
-#veth for lxc
-CONFIG_VETH=m
 
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
@@ -190,12 +137,16 @@ CONFIG_NET_MEDIATEK_SOC=y
 
 CONFIG_ICPLUS_PHY=y
 CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_EVBUG=y
 CONFIG_KEYBOARD_MATRIX=y
 CONFIG_KEYBOARD_SAMSUNG=y
 CONFIG_MOUSE_PS2_ELANTECH=y
 CONFIG_MOUSE_PS2_SENTELIC=y
 CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+
 # CONFIG_SERIO_SERPORT is not set
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_SERIAL_8250=y
@@ -214,6 +165,7 @@ CONFIG_WATCHDOG=y
 CONFIG_MEDIATEK_WATCHDOG=y
 CONFIG_MFD_MT6397=y
 CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_MT6323=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_RC_SUPPORT=y
@@ -271,22 +223,7 @@ CONFIG_CRC_CCITT=m
 CONFIG_CRC_ITU_T=m
 CONFIG_CRYPTO_DEV_MEDIATEK=y
 
-#ARM Accelerated Cryptographic Algorithms
-CONFIG_ARM_CRYPTO=y
-CONFIG_CRYPTO_SHA1_ARM=m
-CONFIG_CRYPTO_SHA1_ARM_NEON=m
-CONFIG_CRYPTO_SHA1_ARM_CE=m
-CONFIG_CRYPTO_SHA2_ARM_CE=m
-CONFIG_CRYPTO_SHA512_ARM=m
-CONFIG_CRYPTO_AES_ARM=m
-CONFIG_CRYPTO_AES_ARM_BS=m
-CONFIG_CRYPTO_AES_ARM_CE=m
-CONFIG_CRYPTO_GHASH_ARM_CE=m
-CONFIG_CRYPTO_CRC32_ARM_CE=m
-CONFIG_CRYPTO_CHACHA20_NEON=m
-
 #LVM
-CONFIG_MD=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_DM_BUFIO=y
 CONFIG_DM_CRYPT=y
@@ -298,15 +235,12 @@ CONFIG_DM_MULTIPATH_ST=y
 CONFIG_DAX=y
 CONFIG_CRYPTO_CBC=y
 
-
 #RamFS
 #CONFIG_INITRAMFS_SOURCE="../rootfs_ttys0_rng.cpio.gz"
 #CONFIG_INITRAMFS_FORCE=y
 
 #Filesystem
 CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
 CONFIG_AUTOFS4_FS=y
 CONFIG_FUSE_FS=m
 CONFIG_MSDOS_FS=m
@@ -330,48 +264,45 @@ CONFIG_CFG80211=y
 
 #internal wlan (not working yet)
 # CONFIG_MTK_CONN_LTE_IDC_SUPPORT is not set
-CONFIG_MTK_COMBO=y
-CONFIG_MTK_COMBO_CHIP_CONSYS_7623=y
+#CONFIG_MTK_COMBO=y
+#CONFIG_MTK_COMBO_CHIP_CONSYS_7623=y
 #used in 4.4, but should be set in Kconfig by selecting mt7623 COMBO
-CONFIG_MTK_PLATFORM="mt7623"
+#CONFIG_MTK_PLATFORM="mt7623"
 
-CONFIG_MTK_COMBO_COMM=y
-CONFIG_MTK_COMBO_WIFI=y
-CONFIG_NL80211_TESTMODE=y
+#CONFIG_MTK_COMBO_COMM=y
+#CONFIG_MTK_COMBO_WIFI=y
+#CONFIG_NL80211_TESTMODE=y
 
 #internal Bluetooth (also not working yet)
-CONFIG_BT=y
-CONFIG_MTK_COMBO_BT=y
-CONFIG_MTK_COMBO_BT_HCI=y
+#CONFIG_BT=y
+#CONFIG_MTK_COMBO_BT=y
+#CONFIG_MTK_COMBO_BT_HCI=y
 #needed for BT?
 #Bluetooth Classic (BR/EDR) features 
-CONFIG_BT_BREDR=y
+#CONFIG_BT_BREDR=y
 #Bluetooth High Speed (HS) features
-CONFIG_BT_HS=y
+#CONFIG_BT_HS=y
 #Bluetooth Low Energy (LE) features
-CONFIG_BT_LE=y
+#CONFIG_BT_LE=y
 #Export Bluetooth internals in debugfs
-CONFIG_BT_DEBUGFS=y
+#CONFIG_BT_DEBUGFS=y
 
 #to run bluetoothd rfkill needed
-CONFIG_RFKILL_LEDS=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_RFKILL_GPIO=y
+#CONFIG_RFKILL_LEDS=y
+#CONFIG_RFKILL_INPUT=y
+#CONFIG_RFKILL_GPIO=y
 
 
 #if you use a mt76x2 or mt76x3 pcie-card
-CONFIG_MT76=m
+#CONFIG_MT76=m
+CONFIG_MT76x2E=m
 
 #pcie
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIE_MEDIATEK=y
 CONFIG_PHY_MTK_TPHY=y
 
 CONFIG_I2C_CHARDEV=m
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1307_CENTURY=y
-
 CONFIG_SPI=y
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_SPIDEV=m
@@ -470,100 +401,17 @@ CONFIG_WLAN_VENDOR_ST=n
 CONFIG_WLAN_VENDOR_TI=n
 CONFIG_WLAN_VENDOR_ZYDAS=n
 CONFIG_WLAN_VENDOR_QUANTENNA=n
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_NET_VENDOR_ADAPTEC is not set
-# CONFIG_NET_VENDOR_AGERE is not set
-# CONFIG_NET_VENDOR_ALACRITECH is not set
-# CONFIG_NET_VENDOR_ALTEON is not set
-# CONFIG_NET_VENDOR_AMAZON is not set
-# CONFIG_NET_VENDOR_AMD is not set
-# CONFIG_NET_VENDOR_AQUANTIA is not set
-# CONFIG_NET_VENDOR_ARC is not set
-# CONFIG_NET_VENDOR_ATHEROS is not set
-# CONFIG_NET_VENDOR_AURORA is not set
-# CONFIG_NET_CADENCE is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_BROCADE is not set
-# CONFIG_NET_VENDOR_CAVIUM is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
-# CONFIG_NET_VENDOR_CIRRUS is not set
-# CONFIG_NET_VENDOR_CISCO is not set
-# CONFIG_NET_MEDIATEK_HNAT is not set
-# CONFIG_NET_VENDOR_MELLANOX is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_MICROCHIP is not set
-# CONFIG_NET_VENDOR_MYRI is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_NETRONOME is not set
-# CONFIG_NET_VENDOR_NVIDIA is not set
-# CONFIG_NET_VENDOR_OKI is not set
-# CONFIG_NET_PACKET_ENGINE is not set
-# CONFIG_NET_VENDOR_QLOGIC is not set
-# CONFIG_NET_VENDOR_QUALCOMM is not set
-# CONFIG_NET_VENDOR_REALTEK is not set
-# CONFIG_NET_VENDOR_RENESAS is not set
-# CONFIG_NET_VENDOR_RDC is not set
-# CONFIG_NET_VENDOR_ROCKER is not set
-# CONFIG_NET_VENDOR_SAMSUNG is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SILAN is not set
-# CONFIG_NET_VENDOR_SIS is not set
-# CONFIG_NET_VENDOR_SOLARFLARE is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NET_VENDOR_SUN is not set
-# CONFIG_NET_VENDOR_TEHUTI is not set
-# CONFIG_NET_VENDOR_TI is not set
-# CONFIG_NET_VENDOR_VIA is not set
-# CONFIG_NET_VENDOR_WIZNET is not set
-# CONFIG_NET_VENDOR_SYNOPSYS is not set
-# CONFIG_NET_VENDOR_DEC is not set
-# CONFIG_NET_VENDOR_DLINK is not set
-# CONFIG_NET_VENDOR_EMULEX is not set
-# CONFIG_NET_VENDOR_EZCHIP is not set
-# CONFIG_NET_VENDOR_EXAR is not set
-# CONFIG_NET_VENDOR_FARADAY is not set
-# CONFIG_NET_VENDOR_HISILICON is not set
-# CONFIG_NET_VENDOR_HP is not set
-# CONFIG_NET_VENDOR_HUAWEI is not set
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_3COM is not set
-
-#NFS Client
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=m
-CONFIG_NFS_SWAP=y
-CONFIG_NFS_V4_1=y
-CONFIG_NFS_V4_2=y
-CONFIG_PNFS_FILE_LAYOUT=m
-CONFIG_PNFS_BLOCK=m
-CONFIG_PNFS_FLEXFILE_LAYOUT=m
-CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
-CONFIG_NFS_V4_1_MIGRATION=y
-CONFIG_NFS_USE_LEGACY_DNS=y
-
-#NFS Server
-CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_PNFS=y
-CONFIG_NFSD_BLOCKLAYOUT=y
-CONFIG_NFSD_SCSILAYOUT=y
-CONFIG_NFSD_FLEXFILELAYOUT=y
-CONFIG_NFSD_FAULT_INJECTION=y
-CONFIG_NFS_ACL_SUPPORT=m
-CONFIG_NFS_COMMON=y
-
-#xfs
-CONFIG_XFS_FS=m
-
-#RTC/POWER
-CONFIG_POWER_RESET=y
-CONFIG_POWER_RESET_MT6397_RTC=y
 
+
+
+#Graphic
+CONFIG_DRM=y
+CONFIG_DRM_ARM=y
+CONFIG_DRM_MALI_DISPLAY=y
+CONFIG_DRM_MEDIATEK=y
+CONFIG_DRM_MEDIATEK_HDMI=y
+CONFIG_COMMON_CLK_MT2701_MMSYS=y
+CONFIG_COMMON_CLK_MT2701_IMGSYS=y
+CONFIG_COMMON_CLK_MT2701_VDECSYS=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_DRM_FBDEV_EMULATION=y

drivers/clk/mediatek/clk-mt2701.c

@@ -46,8 +46,6 @@ static const struct mtk_fixed_clk top_fixed_clks[] = {
 		340 * MHZ),
 	FIXED_CLK(CLK_TOP_HDMI_0_PLL340M, "hdmi_0_pll340m", "clk26m",
 		340 * MHZ),
-	FIXED_CLK(CLK_TOP_HDMITX_CLKDIG_CTS, "hdmitx_dig_cts", "clk26m",
-		300 * MHZ),
 	FIXED_CLK(CLK_TOP_HADDS2_FB, "hadds2_fbclk", "clk26m",
 		27 * MHZ),
 	FIXED_CLK(CLK_TOP_WBG_DIG_416M, "wbg_dig_ck_416m", "clk26m",
@@ -977,6 +975,10 @@ static const struct mtk_pll_data apmixed_plls[] = {
 				21, 0x2d0, 4, 0x0, 0x2d4, 0),
 };
 
+static const struct mtk_fixed_factor apmixed_fixed_divs[] = {
+	FACTOR(CLK_APMIXED_HDMI_REF, "hdmi_ref", "tvdpll", 1, 1),
+};
+
 static int mtk_apmixedsys_init(struct platform_device *pdev)
 {
 	struct clk_onecell_data *clk_data;
@@ -988,6 +990,8 @@ static int mtk_apmixedsys_init(struct platform_device *pdev)
 
 	mtk_clk_register_plls(node, apmixed_plls, ARRAY_SIZE(apmixed_plls),
 								clk_data);
+	mtk_clk_register_factors(apmixed_fixed_divs, ARRAY_SIZE(apmixed_fixed_divs),
+								clk_data);
 
 	return of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);
 }