mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-09-19 22:08:32 +00:00
core/linux-kirkwood to 4.1-1
This commit is contained in:
moonman
parent
d28fc5fbcb
commit
e2827e1b7f
|
|
@ -6,18 +6,18 @@ buildarch=2
|
|||
pkgbase=linux-kirkwood
|
||||
_kernelname=${pkgbase#linux}
|
||||
_desc="Marvell Kirkwood"
|
||||
pkgver=4.0.5
|
||||
pkgver=4.1
|
||||
pkgrel=1
|
||||
cryptodev_commit=5054d20d45571cc85339351fde52f872eeb82206
|
||||
bfqver=v7r7
|
||||
cryptodev_commit=da730106c2558c8e0c8e1b1b1812d32ef9574ab7
|
||||
bfqver=v7r8
|
||||
|
||||
### BFQ patch kernel version
|
||||
bfqkern=${pkgver:0:3}
|
||||
# bfqkern=3.19
|
||||
# bfqkern=${pkgver:0:3}
|
||||
bfqkern=4.0
|
||||
|
||||
### AUFS branch name
|
||||
aufsbranch="aufs${pkgver:0:3}"
|
||||
# aufsbranch="aufs4.x-rcN"
|
||||
# aufsbranch="aufs${pkgver:0:3}"
|
||||
aufsbranch="aufs4.x-rcN"
|
||||
|
||||
arch=('arm')
|
||||
url="http://www.kernel.org/"
|
||||
|
|
@ -35,21 +35,19 @@ source=("https://kernel.org/pub/linux/kernel/v4.x/linux-${pkgver}.tar.xz"
|
|||
"cryptodev-${cryptodev_commit}.tar.gz::https://github.com/cryptodev-linux/cryptodev-linux/archive/${cryptodev_commit}.tar.gz"
|
||||
"ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${bfqkern}.patch"
|
||||
"ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${bfqkern}.patch"
|
||||
"ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${bfqkern}.0.patch"
|
||||
'pci-e_fix.patch')
|
||||
"ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${bfqkern}.0.patch")
|
||||
|
||||
md5sums=('214836ae60a5674c31bb7cede5f47794'
|
||||
'4c93651af09f6ded12855eec3704cba1'
|
||||
'a14080d29d7c4eec01356892c8712656'
|
||||
md5sums=('fe9dc0f6729f36400ea81aa41d614c37'
|
||||
'777d455648bd9d6017bc2620347596e8'
|
||||
'7255d7313b0e2bf975f1a81b2acff2a4'
|
||||
'5faf5d5f9aadf621942bd03c3b993947'
|
||||
'9b5a265440abf57d2052838f31486a3a'
|
||||
'09d44b9f07abfaeaf4f688ee52034786'
|
||||
'SKIP'
|
||||
'8f81b86fffb53ab49d1e48f86383deea'
|
||||
'1131b4cb838e1e5d6b927a98bcb72ba5'
|
||||
'3ede74f476399e72ddcd35c3b58dcf81'
|
||||
'a5d87e551f6456a32b519c4896cdbcfd'
|
||||
'38adb1741da21b699263019f4ed33430')
|
||||
'8fb4d3b7cc970351f3b5078b7893a107'
|
||||
'9b221738c7872804b12d37cc28da662b'
|
||||
'41efdbed6fe578640408ac9dca034261'
|
||||
'77548d22ce35270383210556eb0ba9a5')
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/linux-${pkgver}"
|
||||
|
|
@ -68,9 +66,6 @@ msg2 "Disable buggy TCP segmentation offload implementation"
|
|||
msg2 "http://archlinuxarm.org/forum/viewtopic.php?f=9&t=7692"
|
||||
patch -Np1 -i ${srcdir}/0001-disable-mv643xx_eth-TSO.patch
|
||||
|
||||
msg2 "Fix PCI-E problems. Remove when this patch makes it to upstream"
|
||||
patch -p1 -i ${srcdir}/pci-e_fix.patch
|
||||
|
||||
msg2 "Add the USB_QUIRK_RESET_RESUME for several webcams"
|
||||
# FS#26528
|
||||
patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.patch"
|
||||
|
|
|
|||
|
|
@ -8773,8 +8773,8 @@ diff -ruN a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm
|
|||
|
||||
config ARM_KIRKWOOD_CPUIDLE
|
||||
bool "CPU Idle Driver for Marvell Kirkwood SoCs"
|
||||
- depends on MACH_KIRKWOOD
|
||||
+ depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
|
||||
- depends on MACH_KIRKWOOD && !ARM64
|
||||
+ depends on (ARCH_KIRKWOOD || MACH_KIRKWOOD) && !ARM64
|
||||
help
|
||||
This adds the CPU Idle driver for Marvell Kirkwood SoCs.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 4.0.0-1 Kernel Configuration
|
||||
# Linux/arm 4.1.0-1 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
||||
|
|
@ -17,6 +17,7 @@ CONFIG_ARCH_SUPPORTS_UPROBES=y
|
|||
CONFIG_VECTORS_BASE=0xffff0000
|
||||
CONFIG_ARM_PATCH_PHYS_VIRT=y
|
||||
CONFIG_GENERIC_BUG=y
|
||||
CONFIG_PGTABLE_LEVELS=2
|
||||
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
|
||||
CONFIG_IRQ_WORK=y
|
||||
CONFIG_BUILDTIME_EXTABLE_SORT=y
|
||||
|
|
@ -57,6 +58,7 @@ CONFIG_HAVE_ARCH_AUDITSYSCALL=y
|
|||
#
|
||||
CONFIG_GENERIC_IRQ_PROBE=y
|
||||
CONFIG_GENERIC_IRQ_SHOW=y
|
||||
CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
|
||||
CONFIG_HARDIRQS_SW_RESEND=y
|
||||
CONFIG_GENERIC_IRQ_CHIP=y
|
||||
CONFIG_IRQ_DOMAIN=y
|
||||
|
|
@ -64,7 +66,6 @@ CONFIG_HANDLE_DOMAIN_IRQ=y
|
|||
# CONFIG_IRQ_DOMAIN_DEBUG is not set
|
||||
CONFIG_IRQ_FORCED_THREADING=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
|
||||
|
||||
#
|
||||
# Timers subsystem
|
||||
|
|
@ -103,6 +104,7 @@ CONFIG_RCU_FANOUT_LEAF=16
|
|||
# CONFIG_RCU_BOOST is not set
|
||||
CONFIG_RCU_KTHREAD_PRIO=0
|
||||
# CONFIG_RCU_NOCB_CPU is not set
|
||||
# CONFIG_RCU_EXPEDITE_BOOT is not set
|
||||
CONFIG_BUILD_BIN2C=y
|
||||
CONFIG_IKCONFIG=y
|
||||
CONFIG_IKCONFIG_PROC=y
|
||||
|
|
@ -152,6 +154,7 @@ CONFIG_HAVE_UID16=y
|
|||
CONFIG_BPF=y
|
||||
# CONFIG_EXPERT is not set
|
||||
CONFIG_UID16=y
|
||||
CONFIG_MULTIUSER=y
|
||||
# CONFIG_SGETMASK_SYSCALL is not set
|
||||
CONFIG_SYSFS_SYSCALL=y
|
||||
# CONFIG_SYSCTL_SYSCALL is not set
|
||||
|
|
@ -222,6 +225,7 @@ CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
|
|||
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
|
||||
CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
|
||||
CONFIG_MODULES_USE_ELF_REL=y
|
||||
CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
|
||||
CONFIG_CLONE_BACKWARDS=y
|
||||
CONFIG_OLD_SIGSUSPEND3=y
|
||||
CONFIG_OLD_SIGACTION=y
|
||||
|
|
@ -301,7 +305,6 @@ CONFIG_MMU=y
|
|||
# CONFIG_ARCH_MULTIPLATFORM is not set
|
||||
# CONFIG_ARCH_REALVIEW is not set
|
||||
# CONFIG_ARCH_VERSATILE is not set
|
||||
# CONFIG_ARCH_AT91 is not set
|
||||
# CONFIG_ARCH_CLPS711X is not set
|
||||
# CONFIG_ARCH_GEMINI is not set
|
||||
# CONFIG_ARCH_EBSA110 is not set
|
||||
|
|
@ -321,7 +324,6 @@ CONFIG_ARCH_KIRKWOOD=y
|
|||
# CONFIG_ARCH_W90X900 is not set
|
||||
# CONFIG_ARCH_LPC32XX is not set
|
||||
# CONFIG_ARCH_PXA is not set
|
||||
# CONFIG_ARCH_MSM is not set
|
||||
# CONFIG_ARCH_SHMOBILE_LEGACY is not set
|
||||
# CONFIG_ARCH_RPC is not set
|
||||
# CONFIG_ARCH_SA1100 is not set
|
||||
|
|
@ -536,6 +538,7 @@ CONFIG_CPU_IDLE_GOV_MENU=y
|
|||
#
|
||||
# ARM CPU Idle Drivers
|
||||
#
|
||||
# CONFIG_ARM_CPUIDLE is not set
|
||||
CONFIG_ARM_KIRKWOOD_CPUIDLE=y
|
||||
# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
|
||||
|
||||
|
|
@ -552,7 +555,6 @@ CONFIG_ARM_KIRKWOOD_CPUIDLE=y
|
|||
# Userspace binary formats
|
||||
#
|
||||
CONFIG_BINFMT_ELF=y
|
||||
CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
|
||||
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
|
||||
CONFIG_BINFMT_SCRIPT=y
|
||||
# CONFIG_HAVE_AOUT is not set
|
||||
|
|
@ -845,13 +847,13 @@ CONFIG_IP_SET_LIST_SET=m
|
|||
CONFIG_NF_DEFRAG_IPV4=m
|
||||
CONFIG_NF_CONNTRACK_IPV4=m
|
||||
CONFIG_NF_CONNTRACK_PROC_COMPAT=y
|
||||
CONFIG_NF_LOG_ARP=m
|
||||
CONFIG_NF_LOG_IPV4=m
|
||||
CONFIG_NF_TABLES_IPV4=m
|
||||
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
|
||||
CONFIG_NF_REJECT_IPV4=m
|
||||
CONFIG_NFT_REJECT_IPV4=m
|
||||
CONFIG_NF_TABLES_ARP=m
|
||||
CONFIG_NF_LOG_ARP=m
|
||||
CONFIG_NF_LOG_IPV4=m
|
||||
CONFIG_NF_REJECT_IPV4=m
|
||||
CONFIG_NF_NAT_IPV4=m
|
||||
CONFIG_NFT_CHAIN_NAT_IPV4=m
|
||||
CONFIG_NF_NAT_MASQUERADE_IPV4=m
|
||||
|
|
@ -889,8 +891,8 @@ CONFIG_NF_DEFRAG_IPV6=m
|
|||
CONFIG_NF_CONNTRACK_IPV6=m
|
||||
CONFIG_NF_TABLES_IPV6=m
|
||||
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
|
||||
CONFIG_NF_REJECT_IPV6=m
|
||||
CONFIG_NFT_REJECT_IPV6=m
|
||||
CONFIG_NF_REJECT_IPV6=m
|
||||
CONFIG_NF_LOG_IPV6=m
|
||||
CONFIG_NF_NAT_IPV6=m
|
||||
CONFIG_NFT_CHAIN_NAT_IPV6=m
|
||||
|
|
@ -962,8 +964,6 @@ CONFIG_BRIDGE=m
|
|||
CONFIG_BRIDGE_IGMP_SNOOPING=y
|
||||
CONFIG_BRIDGE_VLAN_FILTERING=y
|
||||
CONFIG_HAVE_NET_DSA=y
|
||||
CONFIG_NET_DSA=y
|
||||
CONFIG_NET_DSA_TAG_EDSA=y
|
||||
CONFIG_VLAN_8021Q=m
|
||||
# CONFIG_VLAN_8021Q_GVRP is not set
|
||||
# CONFIG_VLAN_8021Q_MVRP is not set
|
||||
|
|
@ -979,6 +979,14 @@ CONFIG_IPDDP=m
|
|||
# CONFIG_LAPB is not set
|
||||
# CONFIG_PHONET is not set
|
||||
CONFIG_6LOWPAN=m
|
||||
CONFIG_6LOWPAN_NHC=m
|
||||
CONFIG_6LOWPAN_NHC_DEST=m
|
||||
CONFIG_6LOWPAN_NHC_FRAGMENT=m
|
||||
CONFIG_6LOWPAN_NHC_HOP=m
|
||||
CONFIG_6LOWPAN_NHC_IPV6=m
|
||||
CONFIG_6LOWPAN_NHC_MOBILITY=m
|
||||
CONFIG_6LOWPAN_NHC_ROUTING=m
|
||||
CONFIG_6LOWPAN_NHC_UDP=m
|
||||
# CONFIG_IEEE802154 is not set
|
||||
CONFIG_NET_SCHED=y
|
||||
|
||||
|
|
@ -1057,7 +1065,7 @@ CONFIG_DNS_RESOLVER=y
|
|||
CONFIG_VSOCKETS=m
|
||||
# CONFIG_NETLINK_MMAP is not set
|
||||
# CONFIG_NETLINK_DIAG is not set
|
||||
# CONFIG_NET_MPLS_GSO is not set
|
||||
# CONFIG_MPLS is not set
|
||||
# CONFIG_HSR is not set
|
||||
# CONFIG_NET_SWITCHDEV is not set
|
||||
CONFIG_CGROUP_NET_PRIO=y
|
||||
|
|
@ -1154,11 +1162,15 @@ CONFIG_BT_HIDP=m
|
|||
CONFIG_BT_LE=y
|
||||
# CONFIG_BT_6LOWPAN is not set
|
||||
# CONFIG_BT_SELFTEST is not set
|
||||
CONFIG_BT_DEBUGFS=y
|
||||
|
||||
#
|
||||
# Bluetooth device drivers
|
||||
#
|
||||
CONFIG_BT_INTEL=m
|
||||
CONFIG_BT_BCM=m
|
||||
CONFIG_BT_HCIBTUSB=m
|
||||
CONFIG_BT_HCIBTUSB_BCM=y
|
||||
CONFIG_BT_HCIBTSDIO=m
|
||||
CONFIG_BT_HCIUART=m
|
||||
CONFIG_BT_HCIUART_H4=y
|
||||
|
|
@ -1166,6 +1178,8 @@ CONFIG_BT_HCIUART_BCSP=y
|
|||
CONFIG_BT_HCIUART_ATH3K=y
|
||||
CONFIG_BT_HCIUART_LL=y
|
||||
# CONFIG_BT_HCIUART_3WIRE is not set
|
||||
# CONFIG_BT_HCIUART_INTEL is not set
|
||||
# CONFIG_BT_HCIUART_BCM is not set
|
||||
CONFIG_BT_HCIBCM203X=m
|
||||
CONFIG_BT_HCIBPA10X=m
|
||||
CONFIG_BT_HCIBFUSB=m
|
||||
|
|
@ -1190,6 +1204,7 @@ CONFIG_CFG80211_DEFAULT_PS=y
|
|||
# CONFIG_CFG80211_DEBUGFS is not set
|
||||
# CONFIG_CFG80211_INTERNAL_REGDB is not set
|
||||
CONFIG_CFG80211_WEXT=y
|
||||
CONFIG_CFG80211_WEXT_EXPORT=y
|
||||
CONFIG_LIB80211=m
|
||||
CONFIG_LIB80211_CRYPT_WEP=m
|
||||
CONFIG_LIB80211_CRYPT_CCMP=m
|
||||
|
|
@ -1255,9 +1270,12 @@ CONFIG_DMA_SHARED_BUFFER=y
|
|||
#
|
||||
# Bus devices
|
||||
#
|
||||
CONFIG_ARM_CCI=y
|
||||
CONFIG_ARM_CCI400_COMMON=y
|
||||
CONFIG_ARM_CCI400_PMU=y
|
||||
# CONFIG_ARM_CCN is not set
|
||||
# CONFIG_BRCMSTB_GISB_ARB is not set
|
||||
CONFIG_MVEBU_MBUS=y
|
||||
# CONFIG_ARM_CCN is not set
|
||||
# CONFIG_CONNECTOR is not set
|
||||
CONFIG_MTD=y
|
||||
# CONFIG_MTD_TESTS is not set
|
||||
|
|
@ -1280,6 +1298,7 @@ CONFIG_MTD_BLOCK=m
|
|||
CONFIG_SM_FTL=m
|
||||
# CONFIG_MTD_OOPS is not set
|
||||
# CONFIG_MTD_SWAP is not set
|
||||
# CONFIG_MTD_PARTITIONED_MASTER is not set
|
||||
|
||||
#
|
||||
# RAM/ROM/Flash chip drivers
|
||||
|
|
@ -1393,6 +1412,7 @@ CONFIG_BLK_DEV_SX8=m
|
|||
CONFIG_BLK_DEV_RAM=y
|
||||
CONFIG_BLK_DEV_RAM_COUNT=16
|
||||
CONFIG_BLK_DEV_RAM_SIZE=8192
|
||||
# CONFIG_BLK_DEV_PMEM is not set
|
||||
# CONFIG_CDROM_PKTCDVD is not set
|
||||
CONFIG_ATA_OVER_ETH=m
|
||||
# CONFIG_MG_DISK is not set
|
||||
|
|
@ -1655,6 +1675,7 @@ 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_BIO_PRISON=m
|
||||
|
|
@ -1679,6 +1700,7 @@ CONFIG_DM_UEVENT=y
|
|||
CONFIG_DM_FLAKEY=m
|
||||
CONFIG_DM_VERITY=m
|
||||
# CONFIG_DM_SWITCH is not set
|
||||
# CONFIG_DM_LOG_WRITES is not set
|
||||
CONFIG_TARGET_CORE=m
|
||||
CONFIG_TCM_IBLOCK=m
|
||||
CONFIG_TCM_FILEIO=m
|
||||
|
|
@ -1725,14 +1747,8 @@ CONFIG_CAIF_SPI_SLAVE=m
|
|||
#
|
||||
# Distributed Switch Architecture drivers
|
||||
#
|
||||
CONFIG_NET_DSA_MV88E6XXX=y
|
||||
# CONFIG_NET_DSA_MV88E6060 is not set
|
||||
# CONFIG_NET_DSA_MV88E6XXX is not set
|
||||
# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
|
||||
# CONFIG_NET_DSA_MV88E6131 is not set
|
||||
CONFIG_NET_DSA_MV88E6123_61_65=y
|
||||
# CONFIG_NET_DSA_MV88E6171 is not set
|
||||
# CONFIG_NET_DSA_MV88E6352 is not set
|
||||
# CONFIG_NET_DSA_BCM_SF2 is not set
|
||||
CONFIG_ETHERNET=y
|
||||
CONFIG_NET_VENDOR_3COM=y
|
||||
# CONFIG_VORTEX is not set
|
||||
|
|
@ -1747,7 +1763,6 @@ CONFIG_NET_VENDOR_ALTEON=y
|
|||
CONFIG_NET_VENDOR_AMD=y
|
||||
# CONFIG_AMD8111_ETH is not set
|
||||
# CONFIG_PCNET32 is not set
|
||||
# CONFIG_NET_XGENE is not set
|
||||
CONFIG_NET_VENDOR_ARC=y
|
||||
CONFIG_NET_VENDOR_ATHEROS=y
|
||||
# CONFIG_ATL2 is not set
|
||||
|
|
@ -2253,6 +2268,7 @@ CONFIG_TOUCHSCREEN_DYNAPRO=m
|
|||
CONFIG_TOUCHSCREEN_HAMPSHIRE=m
|
||||
# CONFIG_TOUCHSCREEN_EETI is not set
|
||||
CONFIG_TOUCHSCREEN_FUJITSU=m
|
||||
# CONFIG_TOUCHSCREEN_GOODIX is not set
|
||||
# CONFIG_TOUCHSCREEN_ILI210X is not set
|
||||
CONFIG_TOUCHSCREEN_GUNZE=m
|
||||
# CONFIG_TOUCHSCREEN_ELAN is not set
|
||||
|
|
@ -2296,6 +2312,7 @@ CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
|
|||
CONFIG_TOUCHSCREEN_TSC2007=m
|
||||
# CONFIG_TOUCHSCREEN_ST1232 is not set
|
||||
# CONFIG_TOUCHSCREEN_SUR40 is not set
|
||||
# CONFIG_TOUCHSCREEN_SX8654 is not set
|
||||
CONFIG_TOUCHSCREEN_TPS6507X=m
|
||||
# CONFIG_TOUCHSCREEN_ZFORCE is not set
|
||||
# CONFIG_INPUT_MISC is not set
|
||||
|
|
@ -2355,7 +2372,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=2
|
|||
# CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set
|
||||
# CONFIG_SERIAL_MAX3100 is not set
|
||||
# CONFIG_SERIAL_MAX310X is not set
|
||||
# CONFIG_SERIAL_MFD_HSU is not set
|
||||
CONFIG_SERIAL_CORE=y
|
||||
CONFIG_SERIAL_CORE_CONSOLE=y
|
||||
# CONFIG_SERIAL_JSM is not set
|
||||
|
|
@ -2513,6 +2529,7 @@ CONFIG_PINCTRL=y
|
|||
CONFIG_PINMUX=y
|
||||
CONFIG_PINCONF=y
|
||||
# CONFIG_DEBUG_PINCTRL is not set
|
||||
# CONFIG_PINCTRL_AMD is not set
|
||||
CONFIG_PINCTRL_MVEBU=y
|
||||
CONFIG_PINCTRL_KIRKWOOD=y
|
||||
CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
|
||||
|
|
@ -2523,51 +2540,44 @@ CONFIG_GPIO_DEVRES=y
|
|||
CONFIG_GPIO_SYSFS=y
|
||||
|
||||
#
|
||||
# Memory mapped GPIO drivers:
|
||||
# Memory mapped GPIO drivers
|
||||
#
|
||||
# CONFIG_GPIO_DWAPB is not set
|
||||
# CONFIG_GPIO_GENERIC_PLATFORM is not set
|
||||
# CONFIG_GPIO_SCH311X is not set
|
||||
# CONFIG_GPIO_VX855 is not set
|
||||
|
||||
#
|
||||
# I2C GPIO expanders:
|
||||
# I2C GPIO expanders
|
||||
#
|
||||
# CONFIG_GPIO_ADP5588 is not set
|
||||
# CONFIG_GPIO_MAX7300 is not set
|
||||
# CONFIG_GPIO_MAX732X is not set
|
||||
# CONFIG_GPIO_PCA953X is not set
|
||||
# CONFIG_GPIO_PCF857X is not set
|
||||
# CONFIG_GPIO_SX150X is not set
|
||||
# CONFIG_GPIO_ADP5588 is not set
|
||||
|
||||
#
|
||||
# PCI GPIO expanders:
|
||||
# MFD GPIO expanders
|
||||
#
|
||||
|
||||
#
|
||||
# PCI GPIO expanders
|
||||
#
|
||||
# CONFIG_GPIO_BT8XX is not set
|
||||
# CONFIG_GPIO_AMD8111 is not set
|
||||
# CONFIG_GPIO_BT8XX is not set
|
||||
# CONFIG_GPIO_ML_IOH is not set
|
||||
# CONFIG_GPIO_RDC321X is not set
|
||||
|
||||
#
|
||||
# SPI GPIO expanders:
|
||||
# SPI GPIO expanders
|
||||
#
|
||||
# CONFIG_GPIO_MAX7301 is not set
|
||||
# CONFIG_GPIO_MCP23S08 is not set
|
||||
# CONFIG_GPIO_MC33880 is not set
|
||||
|
||||
#
|
||||
# AC97 GPIO expanders:
|
||||
#
|
||||
|
||||
#
|
||||
# LPC GPIO expanders:
|
||||
#
|
||||
|
||||
#
|
||||
# MODULbus GPIO expanders:
|
||||
#
|
||||
|
||||
#
|
||||
# USB GPIO expanders:
|
||||
# USB GPIO expanders
|
||||
#
|
||||
CONFIG_W1=m
|
||||
|
||||
|
|
@ -2702,6 +2712,7 @@ CONFIG_SENSORS_LM90=m
|
|||
# CONFIG_SENSORS_NCT6683 is not set
|
||||
# CONFIG_SENSORS_NCT6775 is not set
|
||||
CONFIG_SENSORS_NCT7802=m
|
||||
# CONFIG_SENSORS_NCT7904 is not set
|
||||
# CONFIG_SENSORS_PCF8591 is not set
|
||||
# CONFIG_PMBUS is not set
|
||||
# CONFIG_SENSORS_SHT15 is not set
|
||||
|
|
@ -2811,6 +2822,7 @@ CONFIG_BCMA_BLOCKIO=y
|
|||
CONFIG_BCMA_HOST_PCI_POSSIBLE=y
|
||||
CONFIG_BCMA_HOST_PCI=y
|
||||
# CONFIG_BCMA_HOST_SOC is not set
|
||||
CONFIG_BCMA_DRIVER_PCI=y
|
||||
# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
|
||||
# CONFIG_BCMA_DRIVER_GPIO is not set
|
||||
# CONFIG_BCMA_DEBUG is not set
|
||||
|
|
@ -2848,10 +2860,12 @@ CONFIG_MFD_CORE=m
|
|||
# CONFIG_MFD_88PM860X is not set
|
||||
# CONFIG_MFD_MAX14577 is not set
|
||||
# CONFIG_MFD_MAX77693 is not set
|
||||
# CONFIG_MFD_MAX77843 is not set
|
||||
# CONFIG_MFD_MAX8907 is not set
|
||||
# CONFIG_MFD_MAX8925 is not set
|
||||
# CONFIG_MFD_MAX8997 is not set
|
||||
# CONFIG_MFD_MAX8998 is not set
|
||||
# CONFIG_MFD_MT6397 is not set
|
||||
# CONFIG_MFD_MENF21BMC is not set
|
||||
# CONFIG_EZX_PCAP is not set
|
||||
# CONFIG_MFD_VIPERBOARD is not set
|
||||
|
|
@ -2868,6 +2882,7 @@ CONFIG_MFD_CORE=m
|
|||
# CONFIG_MFD_SEC_CORE is not set
|
||||
# CONFIG_MFD_SI476X_CORE is not set
|
||||
# CONFIG_MFD_SM501 is not set
|
||||
# CONFIG_MFD_SKY81452 is not set
|
||||
# CONFIG_MFD_SMSC is not set
|
||||
# CONFIG_ABX500_CORE is not set
|
||||
# CONFIG_MFD_SYSCON is not set
|
||||
|
|
@ -2891,7 +2906,6 @@ CONFIG_MFD_CORE=m
|
|||
# CONFIG_TWL6040_CORE is not set
|
||||
CONFIG_MFD_WL1273_CORE=m
|
||||
# CONFIG_MFD_LM3533 is not set
|
||||
# CONFIG_MFD_TC3589X is not set
|
||||
# CONFIG_MFD_TMIO is not set
|
||||
# CONFIG_MFD_T7L66XB is not set
|
||||
# CONFIG_MFD_TC6387XB is not set
|
||||
|
|
@ -3318,7 +3332,6 @@ CONFIG_MEDIA_TUNER_FC0013=m
|
|||
CONFIG_MEDIA_TUNER_TDA18212=m
|
||||
CONFIG_MEDIA_TUNER_E4000=m
|
||||
CONFIG_MEDIA_TUNER_FC2580=m
|
||||
CONFIG_MEDIA_TUNER_M88TS2022=m
|
||||
CONFIG_MEDIA_TUNER_TUA9001=m
|
||||
CONFIG_MEDIA_TUNER_SI2157=m
|
||||
CONFIG_MEDIA_TUNER_IT913X=m
|
||||
|
|
@ -3400,6 +3413,7 @@ CONFIG_DVB_NXT200X=m
|
|||
CONFIG_DVB_BCM3510=m
|
||||
CONFIG_DVB_LGDT330X=m
|
||||
CONFIG_DVB_LGDT3305=m
|
||||
CONFIG_DVB_LGDT3306A=m
|
||||
CONFIG_DVB_LG2160=m
|
||||
CONFIG_DVB_S5H1409=m
|
||||
CONFIG_DVB_AU8522=m
|
||||
|
|
@ -3621,6 +3635,7 @@ CONFIG_SND_SOC=m
|
|||
# CONFIG_SND_SOC_FSL_SPDIF is not set
|
||||
# CONFIG_SND_SOC_FSL_ESAI is not set
|
||||
# CONFIG_SND_SOC_IMX_AUDMUX is not set
|
||||
# CONFIG_SND_SOC_QCOM is not set
|
||||
# CONFIG_SND_SOC_XTFPGA_I2S is not set
|
||||
CONFIG_SND_SOC_I2C_AND_SPI=m
|
||||
|
||||
|
|
@ -3679,7 +3694,8 @@ CONFIG_SND_SOC_ALC5623=m
|
|||
# CONFIG_SND_SOC_WM8753 is not set
|
||||
# CONFIG_SND_SOC_WM8770 is not set
|
||||
# CONFIG_SND_SOC_WM8776 is not set
|
||||
# CONFIG_SND_SOC_WM8804 is not set
|
||||
# CONFIG_SND_SOC_WM8804_I2C is not set
|
||||
# CONFIG_SND_SOC_WM8804_SPI is not set
|
||||
# CONFIG_SND_SOC_WM8903 is not set
|
||||
# CONFIG_SND_SOC_WM8962 is not set
|
||||
# CONFIG_SND_SOC_WM8978 is not set
|
||||
|
|
@ -3722,7 +3738,6 @@ CONFIG_HID_EZKEY=m
|
|||
CONFIG_HID_HOLTEK=m
|
||||
CONFIG_HOLTEK_FF=y
|
||||
# CONFIG_HID_GT683R is not set
|
||||
CONFIG_HID_HUION=m
|
||||
CONFIG_HID_KEYTOUCH=m
|
||||
CONFIG_HID_KYE=m
|
||||
CONFIG_HID_UCLOGIC=m
|
||||
|
|
@ -3783,6 +3798,7 @@ CONFIG_HID_ZEROPLUS=m
|
|||
CONFIG_ZEROPLUS_FF=y
|
||||
CONFIG_HID_ZYDACRON=m
|
||||
CONFIG_HID_SENSOR_HUB=m
|
||||
# CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set
|
||||
|
||||
#
|
||||
# USB HID support
|
||||
|
|
@ -4063,6 +4079,7 @@ CONFIG_LEDS_NETXBIG=y
|
|||
# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
|
||||
#
|
||||
# CONFIG_LEDS_BLINKM is not set
|
||||
# CONFIG_LEDS_PM8941_WLED is not set
|
||||
|
||||
#
|
||||
# LED Triggers
|
||||
|
|
@ -4105,6 +4122,7 @@ CONFIG_RTC_INTF_DEV=y
|
|||
# I2C RTC drivers
|
||||
#
|
||||
# CONFIG_RTC_DRV_ABB5ZES3 is not set
|
||||
# CONFIG_RTC_DRV_ABX80X is not set
|
||||
# CONFIG_RTC_DRV_DS1307 is not set
|
||||
# CONFIG_RTC_DRV_DS1374 is not set
|
||||
# CONFIG_RTC_DRV_DS1672 is not set
|
||||
|
|
@ -4182,9 +4200,9 @@ CONFIG_DMADEVICES=y
|
|||
# DMA Devices
|
||||
#
|
||||
CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
|
||||
# CONFIG_DW_DMAC_CORE is not set
|
||||
# CONFIG_DW_DMAC is not set
|
||||
# CONFIG_DW_DMAC_PCI is not set
|
||||
# CONFIG_HSU_DMA_PCI is not set
|
||||
CONFIG_MV_XOR=y
|
||||
# CONFIG_NBPFAXI_DMA is not set
|
||||
CONFIG_DMA_ENGINE=y
|
||||
|
|
@ -4308,6 +4326,7 @@ CONFIG_R8188EU=m
|
|||
#
|
||||
# CONFIG_IIO_SIMPLE_DUMMY is not set
|
||||
# CONFIG_FB_SM7XX is not set
|
||||
# CONFIG_FB_SM750 is not set
|
||||
CONFIG_FB_XGI=m
|
||||
# CONFIG_FT1000 is not set
|
||||
|
||||
|
|
@ -4337,6 +4356,7 @@ CONFIG_I2O_EXT_ADAPTEC=y
|
|||
# CONFIG_I2O_BLOCK is not set
|
||||
# CONFIG_I2O_SCSI is not set
|
||||
# CONFIG_I2O_PROC is not set
|
||||
# CONFIG_CHROME_PLATFORMS is not set
|
||||
CONFIG_CLKDEV_LOOKUP=y
|
||||
CONFIG_HAVE_CLK_PREPARE=y
|
||||
CONFIG_COMMON_CLK=y
|
||||
|
|
@ -4361,7 +4381,6 @@ CONFIG_CLKSRC_MMIO=y
|
|||
# CONFIG_SH_TIMER_MTU2 is not set
|
||||
# CONFIG_SH_TIMER_TMU is not set
|
||||
# CONFIG_EM_TIMER_STI is not set
|
||||
# CONFIG_CLKSRC_VERSATILE is not set
|
||||
# CONFIG_MAILBOX is not set
|
||||
CONFIG_IOMMU_SUPPORT=y
|
||||
|
||||
|
|
@ -4511,6 +4530,7 @@ CONFIG_SI7005=m
|
|||
# CONFIG_APDS9300 is not set
|
||||
CONFIG_CM32181=m
|
||||
# CONFIG_CM3232 is not set
|
||||
# CONFIG_CM3323 is not set
|
||||
# CONFIG_CM36651 is not set
|
||||
# CONFIG_GP2AP020A00F is not set
|
||||
# CONFIG_ISL29125 is not set
|
||||
|
|
@ -4546,6 +4566,7 @@ CONFIG_CM32181=m
|
|||
# CONFIG_HID_SENSOR_PRESS is not set
|
||||
# CONFIG_MPL115 is not set
|
||||
# CONFIG_MPL3115 is not set
|
||||
# CONFIG_MS5611 is not set
|
||||
# CONFIG_IIO_ST_PRESS is not set
|
||||
# CONFIG_T5403 is not set
|
||||
|
||||
|
|
@ -4584,6 +4605,11 @@ CONFIG_GENERIC_PHY=y
|
|||
#
|
||||
# CONFIG_ANDROID is not set
|
||||
|
||||
#
|
||||
# Firmware Drivers
|
||||
#
|
||||
# CONFIG_FIRMWARE_MEMMAP is not set
|
||||
|
||||
#
|
||||
# File systems
|
||||
#
|
||||
|
|
@ -4593,6 +4619,8 @@ CONFIG_EXT4_FS=y
|
|||
CONFIG_EXT4_USE_FOR_EXT23=y
|
||||
CONFIG_EXT4_FS_POSIX_ACL=y
|
||||
CONFIG_EXT4_FS_SECURITY=y
|
||||
CONFIG_EXT4_ENCRYPTION=y
|
||||
CONFIG_EXT4_FS_ENCRYPTION=y
|
||||
# CONFIG_EXT4_DEBUG is not set
|
||||
CONFIG_JBD2=y
|
||||
# CONFIG_JBD2_DEBUG is not set
|
||||
|
|
@ -4623,6 +4651,12 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
|
|||
# CONFIG_BTRFS_DEBUG is not set
|
||||
# CONFIG_BTRFS_ASSERT is not set
|
||||
CONFIG_NILFS2_FS=m
|
||||
CONFIG_F2FS_FS=y
|
||||
CONFIG_F2FS_STAT_FS=y
|
||||
CONFIG_F2FS_FS_XATTR=y
|
||||
CONFIG_F2FS_FS_POSIX_ACL=y
|
||||
CONFIG_F2FS_FS_SECURITY=y
|
||||
CONFIG_F2FS_CHECK_FS=y
|
||||
CONFIG_FS_POSIX_ACL=y
|
||||
CONFIG_EXPORTFS=y
|
||||
CONFIG_FILE_LOCKING=y
|
||||
|
|
@ -4745,12 +4779,6 @@ CONFIG_ROMFS_ON_BLOCK=y
|
|||
# CONFIG_PSTORE is not set
|
||||
# CONFIG_SYSV_FS is not set
|
||||
# CONFIG_UFS_FS is not set
|
||||
CONFIG_F2FS_FS=y
|
||||
CONFIG_F2FS_STAT_FS=y
|
||||
CONFIG_F2FS_FS_XATTR=y
|
||||
CONFIG_F2FS_FS_POSIX_ACL=y
|
||||
CONFIG_F2FS_FS_SECURITY=y
|
||||
CONFIG_F2FS_CHECK_FS=y
|
||||
CONFIG_AUFS_FS=y
|
||||
CONFIG_AUFS_BRANCH_MAX_127=y
|
||||
# CONFIG_AUFS_BRANCH_MAX_511 is not set
|
||||
|
|
@ -4925,6 +4953,7 @@ CONFIG_PANIC_TIMEOUT=0
|
|||
CONFIG_SCHED_DEBUG=y
|
||||
CONFIG_SCHEDSTATS=y
|
||||
# CONFIG_SCHED_STACK_END_CHECK is not set
|
||||
# CONFIG_DEBUG_TIMEKEEPING is not set
|
||||
CONFIG_TIMER_STATS=y
|
||||
CONFIG_DEBUG_PREEMPT=y
|
||||
|
||||
|
|
@ -4953,6 +4982,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
|
|||
#
|
||||
# RCU Debugging
|
||||
#
|
||||
# CONFIG_PROVE_RCU is not set
|
||||
# CONFIG_SPARSE_RCU_POINTER is not set
|
||||
# CONFIG_TORTURE_TEST is not set
|
||||
# CONFIG_RCU_TORTURE_TEST is not set
|
||||
|
|
@ -4996,6 +5026,7 @@ CONFIG_PROBE_EVENTS=y
|
|||
# CONFIG_TRACEPOINT_BENCHMARK is not set
|
||||
# CONFIG_RING_BUFFER_BENCHMARK is not set
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
# CONFIG_TRACE_ENUM_MAP_FILE is not set
|
||||
|
||||
#
|
||||
# Runtime Testing
|
||||
|
|
@ -5019,6 +5050,7 @@ CONFIG_PROBE_EVENTS=y
|
|||
# CONFIG_TEST_BPF is not set
|
||||
# CONFIG_TEST_FIRMWARE is not set
|
||||
# CONFIG_TEST_UDELAY is not set
|
||||
# CONFIG_MEMTEST is not set
|
||||
# CONFIG_SAMPLES is not set
|
||||
CONFIG_HAVE_ARCH_KGDB=y
|
||||
# CONFIG_KGDB is not set
|
||||
|
|
@ -5051,7 +5083,7 @@ CONFIG_EARLY_PRINTK=y
|
|||
CONFIG_KEYS=y
|
||||
# CONFIG_PERSISTENT_KEYRINGS is not set
|
||||
# CONFIG_BIG_KEYS is not set
|
||||
# CONFIG_ENCRYPTED_KEYS is not set
|
||||
CONFIG_ENCRYPTED_KEYS=y
|
||||
# CONFIG_SECURITY_DMESG_RESTRICT is not set
|
||||
CONFIG_SECURITY=y
|
||||
CONFIG_SECURITYFS=y
|
||||
|
|
@ -5087,7 +5119,7 @@ CONFIG_CRYPTO_BLKCIPHER=y
|
|||
CONFIG_CRYPTO_BLKCIPHER2=y
|
||||
CONFIG_CRYPTO_HASH=y
|
||||
CONFIG_CRYPTO_HASH2=y
|
||||
CONFIG_CRYPTO_RNG=m
|
||||
CONFIG_CRYPTO_RNG=y
|
||||
CONFIG_CRYPTO_RNG2=y
|
||||
CONFIG_CRYPTO_PCOMP=m
|
||||
CONFIG_CRYPTO_PCOMP2=y
|
||||
|
|
@ -5095,7 +5127,7 @@ CONFIG_CRYPTO_MANAGER=y
|
|||
CONFIG_CRYPTO_MANAGER2=y
|
||||
CONFIG_CRYPTO_USER=m
|
||||
CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
|
||||
CONFIG_CRYPTO_GF128MUL=m
|
||||
CONFIG_CRYPTO_GF128MUL=y
|
||||
CONFIG_CRYPTO_NULL=m
|
||||
CONFIG_CRYPTO_WORKQUEUE=y
|
||||
CONFIG_CRYPTO_CRYPTD=m
|
||||
|
|
@ -5115,17 +5147,17 @@ CONFIG_CRYPTO_SEQIV=m
|
|||
#
|
||||
CONFIG_CRYPTO_CBC=y
|
||||
CONFIG_CRYPTO_CTR=m
|
||||
CONFIG_CRYPTO_CTS=m
|
||||
CONFIG_CRYPTO_CTS=y
|
||||
CONFIG_CRYPTO_ECB=y
|
||||
CONFIG_CRYPTO_LRW=m
|
||||
CONFIG_CRYPTO_PCBC=m
|
||||
CONFIG_CRYPTO_XTS=m
|
||||
CONFIG_CRYPTO_XTS=y
|
||||
|
||||
#
|
||||
# Hash modes
|
||||
#
|
||||
CONFIG_CRYPTO_CMAC=m
|
||||
CONFIG_CRYPTO_HMAC=m
|
||||
CONFIG_CRYPTO_HMAC=y
|
||||
CONFIG_CRYPTO_XCBC=m
|
||||
CONFIG_CRYPTO_VMAC=m
|
||||
|
||||
|
|
@ -5144,8 +5176,7 @@ CONFIG_CRYPTO_RMD160=m
|
|||
CONFIG_CRYPTO_RMD256=m
|
||||
CONFIG_CRYPTO_RMD320=m
|
||||
CONFIG_CRYPTO_SHA1=y
|
||||
CONFIG_CRYPTO_SHA1_ARM=y
|
||||
CONFIG_CRYPTO_SHA256=m
|
||||
CONFIG_CRYPTO_SHA256=y
|
||||
CONFIG_CRYPTO_SHA512=m
|
||||
CONFIG_CRYPTO_TGR192=m
|
||||
CONFIG_CRYPTO_WP512=m
|
||||
|
|
@ -5154,7 +5185,6 @@ CONFIG_CRYPTO_WP512=m
|
|||
# Ciphers
|
||||
#
|
||||
CONFIG_CRYPTO_AES=y
|
||||
CONFIG_CRYPTO_AES_ARM=y
|
||||
CONFIG_CRYPTO_ANUBIS=m
|
||||
CONFIG_CRYPTO_ARC4=y
|
||||
CONFIG_CRYPTO_BLOWFISH=m
|
||||
|
|
@ -5195,6 +5225,10 @@ CONFIG_CRYPTO_HW=y
|
|||
CONFIG_CRYPTO_DEV_MV_CESA=m
|
||||
# CONFIG_CRYPTO_DEV_HIFN_795X is not set
|
||||
# CONFIG_ASYMMETRIC_KEY_TYPE is not set
|
||||
CONFIG_ARM_CRYPTO=y
|
||||
CONFIG_CRYPTO_SHA1_ARM=y
|
||||
CONFIG_CRYPTO_SHA256_ARM=y
|
||||
CONFIG_CRYPTO_AES_ARM=y
|
||||
CONFIG_BINARY_PRINTF=y
|
||||
|
||||
#
|
||||
|
|
@ -5203,6 +5237,7 @@ CONFIG_BINARY_PRINTF=y
|
|||
CONFIG_RAID6_PQ=m
|
||||
CONFIG_BITREVERSE=y
|
||||
# CONFIG_HAVE_ARCH_BITREVERSE is not set
|
||||
CONFIG_RATIONAL=y
|
||||
CONFIG_GENERIC_STRNCPY_FROM_USER=y
|
||||
CONFIG_GENERIC_STRNLEN_USER=y
|
||||
CONFIG_GENERIC_NET_UTILS=y
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# arg 2: the old package version
|
||||
|
||||
KERNEL_NAME=-kirkwood
|
||||
KERNEL_VERSION=4.0.4-1-ARCH
|
||||
KERNEL_VERSION=4.1.0-1-ARCH
|
||||
|
||||
post_install () {
|
||||
# updating module dependencies
|
||||
|
|
|
|||
|
|
@ -1,43 +0,0 @@
|
|||
Commit a0b5cd4ac2d6 ("bus: mvebu-mbus: use automatic I/O
|
||||
synchronization barriers") enabled the usage of automatic I/O
|
||||
synchronization barriers by enabling bit WIN_CTRL_SYNCBARRIER in the
|
||||
control registers of MBus windows, but on non io-coherent platforms
|
||||
(orion5x, kirkwood and dove) the WIN_CTRL_SYNCBARRIER bit in
|
||||
the window control register is either reserved (all windows except 6
|
||||
and 7) or enables read-only protection (windows 6 and 7).
|
||||
|
||||
Signed-off-by: Nicolas Schichan <nschichan@xxxxxxxxxx>
|
||||
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@xxxxxxxxxxxxxxxxxx>
|
||||
Cc: <stable@xxxxxxxxxxxxxxx> # v4.0+
|
||||
Fixes: a0b5cd4ac2d6 ("bus: mvebu-mbus: use automatic I/O synchronization barriers")
|
||||
|
||||
---
|
||||
drivers/bus/mvebu-mbus.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
|
||||
index fb9ec62..7fa4510 100644
|
||||
--- a/drivers/bus/mvebu-mbus.c
|
||||
+++ b/drivers/bus/mvebu-mbus.c
|
||||
@@ -70,6 +70,7 @@
|
||||
*/
|
||||
#define WIN_CTRL_OFF 0x0000
|
||||
#define WIN_CTRL_ENABLE BIT(0)
|
||||
+/* Only on HW I/O coherency capable platforms */
|
||||
#define WIN_CTRL_SYNCBARRIER BIT(1)
|
||||
#define WIN_CTRL_TGT_MASK 0xf0
|
||||
#define WIN_CTRL_TGT_SHIFT 4
|
||||
@@ -323,8 +324,9 @@ static int mvebu_mbus_setup_window(struct mvebu_mbus_state *mbus,
|
||||
ctrl = ((size - 1) & WIN_CTRL_SIZE_MASK) |
|
||||
(attr << WIN_CTRL_ATTR_SHIFT) |
|
||||
(target << WIN_CTRL_TGT_SHIFT) |
|
||||
- WIN_CTRL_SYNCBARRIER |
|
||||
WIN_CTRL_ENABLE;
|
||||
+ if (mbus->hw_io_coherency)
|
||||
+ ctrl |= WIN_CTRL_SYNCBARRIER;
|
||||
|
||||
writel(base & WIN_BASE_LOW, addr + WIN_BASE_OFF);
|
||||
writel(ctrl, addr + WIN_CTRL_OFF);
|
||||
--
|
||||
1.9.1
|
||||
|
||||
Loading…
Reference in a new issue