From 3b3428e384b7aff6093d1a6773027c9095182c6b Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Tue, 10 May 2016 16:30:54 +0200 Subject: arm64: exynos: Select SOC specific drivers Recently some Exynos drivers were moved from arm/mach-exynos to drivers/soc. Building the directory depends on SOC_SAMSUNG Kconfig option so we want it also on ARMv8 platforms, even though none of the drivers support ARMv8 SoCs yet. Signed-off-by: Krzysztof Kozlowski --- arch/arm64/Kconfig.platforms | 1 + 1 file changed, 1 insertion(+) (limited to 'arch') diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 7ef1d05859ae..b6227047abe2 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -36,6 +36,7 @@ config ARCH_EXYNOS select HAVE_S3C_RTC if RTC_CLASS select PINCTRL select PINCTRL_EXYNOS + select SOC_SAMSUNG help This enables support for ARMv8 based Samsung Exynos SoC family. -- cgit v1.2.3 From 9c7a68017503eda3071ba8647bd0b4c716f18c74 Mon Sep 17 00:00:00 2001 From: Kamlakant Patel Date: Thu, 28 Apr 2016 10:32:47 +0530 Subject: arm64: vulcan: enable GPIOLIB in Kconfig Add select GPIOLIB in Kconfig for Broadcom Vulcan ARM64 GPIO driver. Signed-off-by: Kamlakant Patel Signed-off-by: Florian Fainelli --- arch/arm64/Kconfig.platforms | 1 + 1 file changed, 1 insertion(+) (limited to 'arch') diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 7ef1d05859ae..33892f2320cc 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -168,6 +168,7 @@ config ARCH_VEXPRESS config ARCH_VULCAN bool "Broadcom Vulcan SOC Family" + select GPIOLIB help This enables support for Broadcom Vulcan SoC Family -- cgit v1.2.3 From bf56c7762df2ef60512eb58c5f4525d173a4da22 Mon Sep 17 00:00:00 2001 From: Carlo Caione Date: Mon, 2 May 2016 10:02:17 +0200 Subject: ARM64: Kconfig: Select the Amlogic Meson pin controller driver Select the Meson pin controller driver also for the AArch64 Meson platform. Signed-off-by: Carlo Caione Signed-off-by: Kevin Hilman --- arch/arm64/Kconfig.platforms | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch') diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 7ef1d05859ae..26c56177382c 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -66,6 +66,8 @@ config ARCH_MEDIATEK config ARCH_MESON bool "Amlogic Platforms" + select PINCTRL + select PINCTRL_MESON help This enables support for the Amlogic S905 SoCs. -- cgit v1.2.3 From ad763ee76148db8a5d9f7e18011d1df405fca59e Mon Sep 17 00:00:00 2001 From: Chanho Min Date: Wed, 1 Jun 2016 10:39:59 +0900 Subject: arm64: defconfig: Enable Cadence MACB/GEM support This patch enables the cadence MACB/GEM support that is needed by lg1k SoCs. Signed-off-by: Chanho Min Signed-off-by: Olof Johansson --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'arch') diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index fd2d74d0491e..4edbbac33fd2 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -120,6 +120,7 @@ CONFIG_TUN=y CONFIG_VIRTIO_NET=y CONFIG_AMD_XGBE=y CONFIG_NET_XGENE=y +CONFIG_MACB=y CONFIG_E1000E=y CONFIG_IGB=y CONFIG_IGBVF=y -- cgit v1.2.3 From 62bcf9087150f9588456d941d4ee444ead8ed6f2 Mon Sep 17 00:00:00 2001 From: Takeshi Kihara Date: Tue, 24 May 2016 10:54:40 +0900 Subject: arm64: defconfig: enable Renesas R8A7796 SoC This patch enables the Renesas R8A7796 SoC in the arm64 defconfig. Signed-off-by: Takeshi Kihara Signed-off-by: Simon Horman Acked-by: Geert Uytterhoeven --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'arch') diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index fd2d74d0491e..aa473662b3f8 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -45,6 +45,7 @@ CONFIG_ARCH_ROCKCHIP=y CONFIG_ARCH_SEATTLE=y CONFIG_ARCH_RENESAS=y CONFIG_ARCH_R8A7795=y +CONFIG_ARCH_R8A7796=y CONFIG_ARCH_STRATIX10=y CONFIG_ARCH_TEGRA=y CONFIG_ARCH_SPRD=y -- cgit v1.2.3 From 1a9a0536d8ad0ad804758f1f2ce1f2dc0c5e053a Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Fri, 3 Jun 2016 08:18:22 +0200 Subject: arm64: Allow for different DMA and CPU bus offsets On arm64, all SoCs we supported so far either have an IOMMU or have bus addresses equal to CPU addresses. However, with the Raspberry Pi 3 coming up, this is no longer true. To allow DMA to work with an AArch64 kernel on those devices, let's allow devices to have DMA offsets again. Signed-off-by: Alexander Graf Acked-by: Arnd Bergmann Acked-by: Catalin Marinas Signed-off-by: Eric Anholt --- arch/arm64/include/asm/dma-mapping.h | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'arch') diff --git a/arch/arm64/include/asm/dma-mapping.h b/arch/arm64/include/asm/dma-mapping.h index 7dbea6c070ec..ccea82c2b089 100644 --- a/arch/arm64/include/asm/dma-mapping.h +++ b/arch/arm64/include/asm/dma-mapping.h @@ -66,12 +66,16 @@ static inline bool is_device_dma_coherent(struct device *dev) static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr) { - return (dma_addr_t)paddr; + dma_addr_t dev_addr = (dma_addr_t)paddr; + + return dev_addr - ((dma_addr_t)dev->dma_pfn_offset << PAGE_SHIFT); } static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t dev_addr) { - return (phys_addr_t)dev_addr; + phys_addr_t paddr = (phys_addr_t)dev_addr; + + return paddr + ((phys_addr_t)dev->dma_pfn_offset << PAGE_SHIFT); } static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) @@ -86,5 +90,14 @@ static inline void dma_mark_clean(void *addr, size_t size) { } +/* Override for dma_max_pfn() */ +static inline unsigned long dma_max_pfn(struct device *dev) +{ + dma_addr_t dma_max = (dma_addr_t)*dev->dma_mask; + + return (ulong)dma_to_phys(dev, dma_max) >> PAGE_SHIFT; +} +#define dma_max_pfn(dev) dma_max_pfn(dev) + #endif /* __KERNEL__ */ #endif /* __ASM_DMA_MAPPING_H */ -- cgit v1.2.3 From 16740e7f89fb74253b5897a7525c68becee65beb Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Mon, 13 Jun 2016 16:57:22 +0200 Subject: arm64: defconfig: disable plain NEON implementation of AES The plain NEON implementation of AES is only suited for v8 cores that lack the ARMv8 Crypto Extensions but have an implementation of the NEON tbl/tbx instruction that is not pathetically slow. Unfortunately, this is currently the empty set, so there is no point in including this implementation by default. So disable it. Signed-off-by: Ard Biesheuvel Signed-off-by: Olof Johansson --- arch/arm64/configs/defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch') diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 4edbbac33fd2..83dd183077ef 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -344,5 +344,5 @@ CONFIG_CRYPTO_SHA2_ARM64_CE=y CONFIG_CRYPTO_GHASH_ARM64_CE=y CONFIG_CRYPTO_AES_ARM64_CE_CCM=y CONFIG_CRYPTO_AES_ARM64_CE_BLK=y -CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y +# CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set CONFIG_CRYPTO_CRC32_ARM64=y -- cgit v1.2.3 From 628d30d1ccb897fee54a6f7312561cf2f6f72f09 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 3 Jun 2016 08:18:23 +0200 Subject: arm64: Add platform selection for BCM2835. Signed-off-by: Eric Anholt [ kraxel: copy some selects from arm to arm64 ] Signed-off-by: Gerd Hoffmann Acked-by: Catalin Marinas --- arch/arm64/Kconfig.platforms | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'arch') diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 7ef1d05859ae..ea88402eb724 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -13,6 +13,19 @@ config ARCH_ALPINE This enables support for the Annapurna Labs Alpine Soc family. +config ARCH_BCM2835 + bool "Broadcom BCM2835 family" + select ARCH_REQUIRE_GPIOLIB + select CLKSRC_OF + select PINCTRL + select PINCTRL_BCM2835 + select ARM_AMBA + select ARM_TIMER_SP804 + select HAVE_ARM_ARCH_TIMER + help + This enables support for the Broadcom BCM2837 SoC. + This SoC is used in the Raspberry Pi 3 device. + config ARCH_BCM_IPROC bool "Broadcom iProc SoC Family" select COMMON_CLK_IPROC -- cgit v1.2.3 From 4cf28937cac21f90cacc9477e917d90c2d9ff0b3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 19 May 2016 14:11:34 +0200 Subject: arm64: configs: enable PCIe driver for Armada 7K/8K This patch enables the driver for the PCIe host controller found on the Marvell Armada 7K/8K ARM64 SoCs. Signed-off-by: Thomas Petazzoni Signed-off-by: Gregory CLEMENT --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'arch') diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index fd2d74d0491e..2f6787c016d7 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -63,6 +63,7 @@ CONFIG_PCI_XGENE=y CONFIG_PCI_LAYERSCAPE=y CONFIG_PCI_HISI=y CONFIG_PCIE_QCOM=y +CONFIG_PCIE_ARMADA_8K=y CONFIG_ARM64_VA_BITS_48=y CONFIG_SCHED_MC=y CONFIG_PREEMPT=y -- cgit v1.2.3 From 71ee68a8e7a37a020433a11388ef8e86310662f2 Mon Sep 17 00:00:00 2001 From: Sudeep Holla Date: Mon, 20 Jun 2016 16:24:08 +0100 Subject: arm64: defconfig: enable Generic on-chip SRAM driver Most of the ARM SoCs have small SRAM memory used for various purposes that require faster access to data compared to normal DDR. This patch enables the Generic on-chip SRAM driver on ARM64. Cc: Kevin Hilman Cc: Olof Johansson Cc: Arnd Bergmann Signed-off-by: Sudeep Holla --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'arch') diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index fd2d74d0491e..07fcc465bbae 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -101,6 +101,7 @@ CONFIG_MTD_M25P80=y CONFIG_MTD_SPI_NOR=y CONFIG_BLK_DEV_LOOP=y CONFIG_VIRTIO_BLK=y +CONFIG_SRAM=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y # CONFIG_SCSI_LOWLEVEL is not set -- cgit v1.2.3 From 2a0e527c7ed60f9c85233bfe69a9023798c1d428 Mon Sep 17 00:00:00 2001 From: Javi Merino Date: Mon, 13 Jun 2016 16:15:14 +0100 Subject: arm64: defconfig: enable SENSORS_ARM_SCPI ARM SCPI Sensors were merged for v4.4 and they are defined in the Juno dts. Enable it in the defconfig to get them registered automatically in Juno by default. Signed-off-by: Javi Merino Signed-off-by: Sudeep Holla --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'arch') diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 07fcc465bbae..d284253070b2 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -198,6 +198,7 @@ CONFIG_POWER_RESET_XGENE=y CONFIG_POWER_RESET_SYSCON=y CONFIG_SENSORS_LM90=m CONFIG_SENSORS_INA2XX=m +CONFIG_SENSORS_ARM_SCPI=y CONFIG_THERMAL=y CONFIG_THERMAL_EMULATION=y CONFIG_EXYNOS_THERMAL=y -- cgit v1.2.3 From 8da7cc087b27c039a217c2b5b13df717bc6bbc88 Mon Sep 17 00:00:00 2001 From: Sudeep Holla Date: Mon, 20 Jun 2016 15:56:09 +0100 Subject: arm64: Kconfig: select PM{,_GENERIC_DOMAINS} for ARCH_VEXPRESS The Linux AMBA bus framework probes the peripheral IDs when adding the AMBA devices very early on the boot. Generally they are on APB bus and just require APB clocks to be on even when most of the core logic of the IP is powered down. However on Juno, the entire debugsys domain needs to be ON to access even the coresight components' CID/PID registers and hence broken by design. Accessing those while debugsys power domain is off will lead to the bridge stalling the transactions instead of returning the slave error. Further, the AMBA framework can't deal with !CONFIG_PM_GENERIC_DOMAINS case: it ignores the error and proceeds to access the device region. It was suggested to always enable CONFIG_PM{,_GENERIC_DOMAINS} in order to handle above explained scenario. Cc: Arnd Bergmann Suggested-by: Ulf Hansson Signed-off-by: Sudeep Holla Signed-off-by: Olof Johansson --- arch/arm64/Kconfig.platforms | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch') diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index f5e7db6d6b2e..89712f71ef26 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -163,6 +163,8 @@ config ARCH_VEXPRESS bool "ARMv8 software model (Versatile Express)" select ARCH_REQUIRE_GPIOLIB select COMMON_CLK_VERSATILE + select PM + select PM_GENERIC_DOMAINS select POWER_RESET_VEXPRESS select VEXPRESS_CONFIG help -- cgit v1.2.3 From 72557a658a4e0603814e09f3bc8551f2d3b58802 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Fri, 3 Jun 2016 15:38:15 -0700 Subject: arm64: defconfig: enable stmmac and realtek PHY as modules Some Amlogic GXBB boards use the stmmac ethernet driver. Also, enable the realtek PHY used on meson-gxbb-odroidc2. The micrel PHY used on the meson-gxbb-p20x boards is already enabled. Signed-off-by: Kevin Hilman --- arch/arm64/configs/defconfig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch') diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 83dd183077ef..a8dd03e28ed7 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -128,6 +128,8 @@ CONFIG_SKY2=y CONFIG_RAVB=y CONFIG_SMC91X=y CONFIG_SMSC911X=y +CONFIG_STMMAC_ETH=m +CONFIG_REALTEK_PHY=m CONFIG_MICREL_PHY=y CONFIG_USB_PEGASUS=m CONFIG_USB_RTL8150=m -- cgit v1.2.3 From fde88a07156cc767dee7c2c2be6b8f73c6323743 Mon Sep 17 00:00:00 2001 From: Andy Gross Date: Thu, 19 May 2016 00:00:17 -0500 Subject: arm: defconfig: Enable PM8941 pwr key This patch enables the PM8941 pwr key driver. Signed-off-by: Andy Gross Reviewed-by: Bjorn Andersson --- arch/arm64/configs/defconfig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch') diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index fd2d74d0491e..1f63675660cb 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -142,6 +142,8 @@ CONFIG_WL18XX=m CONFIG_WLCORE_SDIO=m CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_GPIO=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_PM8941_PWRKEY=y # CONFIG_SERIO_SERPORT is not set CONFIG_SERIO_AMBAKMI=y CONFIG_LEGACY_PTY_COUNT=16 -- cgit v1.2.3 From 28f049df25f9a5dfcbb1e7a11f439c8b1756a205 Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Wed, 15 Jun 2016 18:07:51 -0700 Subject: arm64: defconfig: Enable qcom msm8996 clk drivers Enable the clk drivers on msm8996. This allows us to boot and test most device drivers on this SoC. Signed-off-by: Stephen Boyd Signed-off-by: Andy Gross --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'arch') diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 1f63675660cb..62ca1e4d9c76 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -287,6 +287,7 @@ CONFIG_COMMON_CLK_CS2000_CP=y CONFIG_CLK_QORIQ=y CONFIG_COMMON_CLK_QCOM=y CONFIG_MSM_GCC_8916=y +CONFIG_MSM_MMCC_8996=y CONFIG_HWSPINLOCK_QCOM=y CONFIG_MAILBOX=y CONFIG_ARM_MHU=y -- cgit v1.2.3 From f1a176f25aec6a2602040c62e09375596f4dc1a0 Mon Sep 17 00:00:00 2001 From: Srinivas Kandagatla Date: Fri, 17 Jun 2016 16:18:02 +0100 Subject: arm64: defconfig: enable msm8996 pinctrl support This patch enables pinctrl support required to boot msm8996/apq8096 boards. Signed-off-by: Srinivas Kandagatla Signed-off-by: Andy Gross --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'arch') diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 62ca1e4d9c76..0f19eed6f75c 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -188,6 +188,7 @@ CONFIG_SPI_SPIDEV=m CONFIG_SPMI=y CONFIG_PINCTRL_SINGLE=y CONFIG_PINCTRL_MSM8916=y +CONFIG_PINCTRL_MSM8996=y CONFIG_PINCTRL_QCOM_SPMI_PMIC=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_DWAPB=y -- cgit v1.2.3 From ff60d834d1e0d1b4560b14daab1bc165667af7b4 Mon Sep 17 00:00:00 2001 From: Gregory CLEMENT Date: Fri, 10 Jun 2016 15:23:29 +0200 Subject: arm64: marvell: enable Armada 3700 clock drivers This patch enables the support for the clocks drivers used on the Armada 3700. Signed-off-by: Gregory CLEMENT --- arch/arm64/Kconfig.platforms | 1 + 1 file changed, 1 insertion(+) (limited to 'arch') diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 7ef1d05859ae..2fdadff9143d 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -73,6 +73,7 @@ config ARCH_MVEBU bool "Marvell EBU SoC Family" select ARMADA_AP806_SYSCON select ARMADA_CP110_SYSCON + select ARMADA_37XX_CLK select MVEBU_ODMI help This enables support for Marvell EBU familly, including: -- cgit v1.2.3 From 46926e27d81e15b4c87ddb449461fc4f9a7c95ad Mon Sep 17 00:00:00 2001 From: Alim Akhtar Date: Tue, 5 Jul 2016 15:36:51 +0530 Subject: arm64: defconfig: Enable S2MPS11 clock and S3C RTC driver The S3C RTC controller on Exynos7 platform uses RTC source clock from S2MPS11 PMIC. This patch enables the required drivers to make RTC work on Exynos7 Espresso board. Signed-off-by: Alim Akhtar Reviewed-by: Javier Martinez Canillas Signed-off-by: Krzysztof Kozlowski --- arch/arm64/configs/defconfig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch') diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index fd2d74d0491e..c05b8badec2c 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -268,6 +268,7 @@ CONFIG_RTC_DRV_EFI=y CONFIG_RTC_DRV_PL031=y CONFIG_RTC_DRV_SUN6I=y CONFIG_RTC_DRV_XGENE=y +CONFIG_RTC_DRV_S3C=y CONFIG_DMADEVICES=y CONFIG_PL330_DMA=y CONFIG_TEGRA20_APB_DMA=y @@ -282,6 +283,7 @@ CONFIG_XEN_GNTDEV=y CONFIG_XEN_GRANT_DEV_ALLOC=y CONFIG_COMMON_CLK_SCPI=y CONFIG_COMMON_CLK_CS2000_CP=y +CONFIG_COMMON_CLK_S2MPS11=y CONFIG_CLK_QORIQ=y CONFIG_COMMON_CLK_QCOM=y CONFIG_MSM_GCC_8916=y -- cgit v1.2.3 From 59bdefe978bb29be6b0c6d4aff958fa44d21a945 Mon Sep 17 00:00:00 2001 From: Michael Turquette Date: Wed, 22 Jun 2016 19:12:22 -0700 Subject: arm64: amlogic: select gxbb clk driver The AmLogic clock controller code is used by both arm and arm64 architectures. Explicitly select the core code for all Meson (arm64) builds, and also select the GXBB driver, since that's the way arm64 does things. Signed-off-by: Michael Turquette Signed-off-by: Kevin Hilman Signed-off-by: Arnd Bergmann --- arch/arm64/Kconfig.platforms | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch') diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 143761dd09d1..ca196d8e76f2 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -82,6 +82,8 @@ config ARCH_MESON bool "Amlogic Platforms" select PINCTRL select PINCTRL_MESON + select COMMON_CLK_AMLOGIC + select COMMON_CLK_GXBB help This enables support for the Amlogic S905 SoCs. -- cgit v1.2.3 From 426f754be0bc258c269524bce162ae0ca1cb8927 Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Fri, 8 Jul 2016 22:17:03 +0200 Subject: arm64: defconfig: Enable more IP blocks for Exynos7 and Exynos5433 Enable more drivers for IP blocks for existing Exynos7 and upcoming Exynos5433: 1. SPI, 2. Watchdog, 3. USB: DWC3, Exynos EHCI and OHCI, 4. Exynos ADC, 5. Samsung PWM. These are already used by Exynos7 Espresso board or will be used by Exynos5433 based board. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Alim Akhtar --- arch/arm64/configs/defconfig | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'arch') diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index c05b8badec2c..fe6d6c34323a 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -183,6 +183,7 @@ CONFIG_SPI_ORION=y CONFIG_SPI_PL022=y CONFIG_SPI_QUP=y CONFIG_SPI_SPIDEV=m +CONFIG_SPI_S3C64XX=y CONFIG_SPMI=y CONFIG_PINCTRL_SINGLE=y CONFIG_PINCTRL_MSM8916=y @@ -202,6 +203,7 @@ CONFIG_THERMAL_EMULATION=y CONFIG_EXYNOS_THERMAL=y CONFIG_WATCHDOG=y CONFIG_RENESAS_WDT=y +CONFIG_S3C2410_WATCHDOG=y CONFIG_MFD_SPMI_PMIC=y CONFIG_MFD_SEC_CORE=y CONFIG_MFD_HI655X_PMIC=y @@ -221,18 +223,22 @@ CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_SOC=y CONFIG_SND_SOC_RCAR=y +CONFIG_SND_SOC_SAMSUNG=y CONFIG_SND_SOC_AK4613=y CONFIG_USB=y CONFIG_USB_OTG=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_RCAR=y +CONFIG_USB_EHCI_EXYNOS=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_MSM=y CONFIG_USB_EHCI_HCD_PLATFORM=y +CONFIG_USB_OHCI_EXYNOS=y CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_USB_STORAGE=y CONFIG_USB_DWC2=y +CONFIG_USB_DWC3=y CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_CHIPIDEA_HOST=y @@ -304,6 +310,10 @@ CONFIG_PHY_HI6220_USB=y CONFIG_PHY_XGENE=y CONFIG_ARM_SCPI_PROTOCOL=y CONFIG_ACPI=y +CONFIG_IIO=y +CONFIG_EXYNOS_ADC=y +CONFIG_PWM=y +CONFIG_PWM_SAMSUNG=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y CONFIG_FANOTIFY=y -- cgit v1.2.3 From 10a7b37b5b969d9998912e50946f7a03111037eb Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Wed, 8 Jun 2016 19:23:19 +0200 Subject: arm64: Update default configuration Enable a couple of drivers that are used on Jetson TX1: * GPIO_PCA953X, GPIO_PCA953X_IRQ: Two instances of this I2C GPIO expander are used on Jetson TX1 to expand the number of usable GPIOs on the I/O board. Enable the driver for this expander along with IRQ support. * MFD_MAX77620, REGULATOR_MAX77620, PINCTRL_MAX77620, GPIO_MAX77620, RTC_DRV_MAX77686: Enable support for the PMIC and various of its components found on the Jetson TX1 processor module (p2180). * RTC_DRV_TEGRA: This RTC is usually not hooked up to a battery on boards, but it can be useful as a wakeup source from suspend to RAM. * REGULATOR_PWM: The GPU is supplied by a regulator controlled via one of the Tegra's PWM channels. * DRM, DRM_NOUVEAU, DRM_TEGRA, DRM_PANEL_SIMPLE: Enable support for an optional DSI panel on Jetson TX1 as well as the GPU. * BACKLIGHT_GENERIC, BACKLIGHT_LP855X: The backlight on Jetson TX1, if shipped with a display module, is driver by an LP8557. * PHY_TEGRA_XUSB, USB_XHCI_TEGRA: Enable support for XUSB (USB 3.0) on Jetson TX1. * PWM, PWM_TEGRA: One of the PWM channels is used to control the voltage supplied to the GPU. * NFS_V4_1, NFS_V4_2: Support these newer versions of the NFS protocol to increase compatibility with distributions. * MFD_CROS_EC, MFD_CROS_EC_I2C and I2C_CROS_EC_TUNNEL: Used to enable the ChromeOS Embedded Controller and the I2C tunnel that allows the EC to function as an I2C bridge. * BATTERY_BQ27XXX: Support the battery charger and monitor found on the Google Pixel C. Signed-off-by: Thierry Reding --- arch/arm64/configs/defconfig | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'arch') diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index fd2d74d0491e..1cf5730976b5 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -178,6 +178,7 @@ CONFIG_I2C_QUP=y CONFIG_I2C_TEGRA=y CONFIG_I2C_UNIPHIER_F=y CONFIG_I2C_RCAR=y +CONFIG_I2C_CROS_EC_TUNNEL=y CONFIG_SPI=y CONFIG_SPI_ORION=y CONFIG_SPI_PL022=y @@ -185,6 +186,7 @@ CONFIG_SPI_QUP=y CONFIG_SPI_SPIDEV=m CONFIG_SPMI=y CONFIG_PINCTRL_SINGLE=y +CONFIG_PINCTRL_MAX77620=y CONFIG_PINCTRL_MSM8916=y CONFIG_PINCTRL_QCOM_SPMI_PMIC=y CONFIG_GPIO_SYSFS=y @@ -192,7 +194,11 @@ CONFIG_GPIO_DWAPB=y CONFIG_GPIO_PL061=y CONFIG_GPIO_RCAR=y CONFIG_GPIO_XGENE=y +CONFIG_GPIO_PCA953X=y +CONFIG_GPIO_PCA953X_IRQ=y +CONFIG_GPIO_MAX77620=y CONFIG_POWER_RESET_MSM=y +CONFIG_BATTERY_BQ27XXX=y CONFIG_POWER_RESET_XGENE=y CONFIG_POWER_RESET_SYSCON=y CONFIG_SENSORS_LM90=m @@ -202,17 +208,28 @@ CONFIG_THERMAL_EMULATION=y CONFIG_EXYNOS_THERMAL=y CONFIG_WATCHDOG=y CONFIG_RENESAS_WDT=y +CONFIG_MFD_MAX77620=y CONFIG_MFD_SPMI_PMIC=y CONFIG_MFD_SEC_CORE=y CONFIG_MFD_HI655X_PMIC=y CONFIG_REGULATOR=y +CONFIG_MFD_CROS_EC=y +CONFIG_MFD_CROS_EC_I2C=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_HI655X=y +CONFIG_REGULATOR_MAX77620=y +CONFIG_REGULATOR_PWM=y CONFIG_REGULATOR_QCOM_SMD_RPM=y CONFIG_REGULATOR_QCOM_SPMI=y CONFIG_REGULATOR_S2MPS11=y +CONFIG_DRM=m +CONFIG_DRM_NOUVEAU=m +CONFIG_DRM_TEGRA=m +CONFIG_DRM_PANEL_SIMPLE=m CONFIG_FB=y CONFIG_FB_ARMCLCD=y +CONFIG_BACKLIGHT_GENERIC=m +CONFIG_BACKLIGHT_LP855X=m CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_LOGO=y # CONFIG_LOGO_LINUX_MONO is not set @@ -226,6 +243,7 @@ CONFIG_USB=y CONFIG_USB_OTG=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_RCAR=y +CONFIG_USB_XHCI_TEGRA=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_MSM=y CONFIG_USB_EHCI_HCD_PLATFORM=y @@ -262,11 +280,13 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_CPU=y CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_MAX77686=y CONFIG_RTC_DRV_S5M=y CONFIG_RTC_DRV_DS3232=y CONFIG_RTC_DRV_EFI=y CONFIG_RTC_DRV_PL031=y CONFIG_RTC_DRV_SUN6I=y +CONFIG_RTC_DRV_TEGRA=y CONFIG_RTC_DRV_XGENE=y CONFIG_DMADEVICES=y CONFIG_PL330_DMA=y @@ -296,10 +316,13 @@ CONFIG_QCOM_SMD_RPM=y CONFIG_ARCH_TEGRA_132_SOC=y CONFIG_ARCH_TEGRA_210_SOC=y CONFIG_EXTCON_USB_GPIO=y +CONFIG_PWM=y +CONFIG_PWM_TEGRA=m CONFIG_COMMON_RESET_HI6220=y CONFIG_PHY_RCAR_GEN3_USB2=y CONFIG_PHY_HI6220_USB=y CONFIG_PHY_XGENE=y +CONFIG_PHY_TEGRA_XUSB=y CONFIG_ARM_SCPI_PROTOCOL=y CONFIG_ACPI=y CONFIG_EXT2_FS=y @@ -318,6 +341,8 @@ CONFIG_EFIVAR_FS=y CONFIG_SQUASHFS=y CONFIG_NFS_FS=y CONFIG_NFS_V4=y +CONFIG_NFS_V4_1=y +CONFIG_NFS_V4_2=y CONFIG_ROOT_NFS=y CONFIG_9P_FS=y CONFIG_NLS_CODEPAGE_437=y -- cgit v1.2.3 From 7e03e116e7603fa30e150df889e8daccd429facf Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Fri, 15 Jul 2016 22:33:40 +0200 Subject: arm64: remove duplicate PWM entry in defconfig We merged two patches that both enabled CONFIG_PWM, leading to a harmless warning: arch/arm64/configs/defconfig:352:warning: override: reassigning to symbol PWM This removes one of the two identical lines to avoid the warning. Signed-off-by: Arnd Bergmann --- arch/arm64/configs/defconfig | 1 - 1 file changed, 1 deletion(-) (limited to 'arch') diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index ec402b499536..d3aa857f2dac 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -346,7 +346,6 @@ CONFIG_ARM_SCPI_PROTOCOL=y CONFIG_ACPI=y CONFIG_IIO=y CONFIG_EXYNOS_ADC=y -CONFIG_PWM=y CONFIG_PWM_SAMSUNG=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y -- cgit v1.2.3