From 015d26a2a39e37cc7732e4fd96da10fd23f194ad Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 10 Jun 2016 18:37:48 +0100 Subject: [PATCH] Fix Power64 module filters, Minor ARM updates --- config-arm-generic | 7 ++++++- config-arm64 | 1 + config-armv7-generic | 1 - filter-ppc64.sh | 2 +- filter-ppc64le.sh | 2 +- filter-ppc64p7.sh | 2 +- kernel.spec | 4 ++++ 7 files changed, 14 insertions(+), 5 deletions(-) diff --git a/config-arm-generic b/config-arm-generic index eae9b5087..8e8c8d8f8 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -131,8 +131,9 @@ CONFIG_ROCKCHIP_THERMAL=m CONFIG_DRM_ROCKCHIP=m CONFIG_ROCKCHIP_ANALOGIX_DP=m CONFIG_ROCKCHIP_DW_HDMI=m -CONFIG_ROCKCHIP_DW_MIPI_DSI=y +CONFIG_ROCKCHIP_DW_MIPI_DSI=m CONFIG_ROCKCHIP_INNO_HDMI=m +CONFIG_DRM_ANALOGIX_DP=m CONFIG_PHY_ROCKCHIP_USB=m CONFIG_DWMAC_ROCKCHIP=m CONFIG_SND_SOC_ROCKCHIP=m @@ -428,6 +429,10 @@ CONFIG_PINCTRL=y CONFIG_GENERIC_PINCONF=y CONFIG_PINCTRL_SINGLE=y +# gpio +CONFIG_GPIO_PCA953X=y +CONFIG_GPIO_PCA953X_IRQ=y + #i2c CONFIG_I2C_ARB_GPIO_CHALLENGE=m CONFIG_I2C_BOARDINFO=y diff --git a/config-arm64 b/config-arm64 index 0d33b00ce..b8d477f3c 100644 --- a/config-arm64 +++ b/config-arm64 @@ -163,6 +163,7 @@ CONFIG_HISI_KIRIN_DW_DSI=m CONFIG_ARCH_TEGRA_132_SOC=y CONFIG_ARCH_TEGRA_210_SOC=y CONFIG_TEGRA210_ADMA=y +CONFIG_MFD_MAX77620=y # AllWinner CONFIG_MACH_SUN50I=y diff --git a/config-armv7-generic b/config-armv7-generic index cc4e111d5..a1e4bf95e 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -206,7 +206,6 @@ CONFIG_SPI_SUN4I=m CONFIG_SPI_SUN6I=m CONFIG_MMC_SUNXI=m CONFIG_I2C_SUN6I_P2WI=m -CONFIG_GPIO_PCA953X=m CONFIG_GPIO_PCF857X=m CONFIG_TOUCHSCREEN_SUN4I=m CONFIG_MFD_AXP20X=y diff --git a/filter-ppc64.sh b/filter-ppc64.sh index e4990bbcb..a99c52058 100644 --- a/filter-ppc64.sh +++ b/filter-ppc64.sh @@ -11,4 +11,4 @@ driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn leds media memstick message mmc mtd mwave nfc ntb pcmcia platform power ssb staging uio uwb w1" -singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qla1280 9pnet_rdma rpcrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target" +singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qla1280 9pnet_rdma rpcrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i" diff --git a/filter-ppc64le.sh b/filter-ppc64le.sh index e44c88ec5..8d3ad2d27 100644 --- a/filter-ppc64le.sh +++ b/filter-ppc64le.sh @@ -11,4 +11,4 @@ driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn leds media memstick message mmc mtd mwave nfc ntb pcmcia platform power ssb staging uio uwb w1" -singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qla1280 9pnet_rdma rpcrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target" +singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qla1280 9pnet_rdma rpcrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i" diff --git a/filter-ppc64p7.sh b/filter-ppc64p7.sh index b499f0e69..b8eebb369 100644 --- a/filter-ppc64p7.sh +++ b/filter-ppc64p7.sh @@ -11,4 +11,4 @@ driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn leds media memstick message mmc mtd mwave nfc ntb pcmcia platform power ssb staging uio uwb w1" -singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qla1280 9pnet_rdma rpcrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target" +singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qla1280 9pnet_rdma rpcrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i" diff --git a/kernel.spec b/kernel.spec index 66e682847..ee6efcbfe 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2133,6 +2133,10 @@ fi # # %changelog +* Fri Jun 10 2016 Peter Robinson +- Fix Power64 module filters +- Minor ARM updates + * Fri Jun 10 2016 Laura Abbott - 4.7.0-0.rc2.git3.1 - Linux v4.7-rc2-64-g147d9e7