From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 4 Sep 2019 13:00:06 +0000 (+0200)
Subject: Merge tag 'arm-soc/for-5.4/defconfig-arm64' of https://github.com/Broadcom/stblinux... 
X-Git-Tag: for-5.4/post-2019-09-24~49^2~7
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6729303cb6bca32e1803ee06e6782a4062873527;p=linux-block.git

Merge tag 'arm-soc/for-5.4/defconfig-arm64' of https://github.com/Broadcom/stblinux into arm/defconfig

This pull request contains Broadcom ARM64-based SoCs defconfig updates
for 5.4, please pull the following:

- Nicolas enables the Raspberry Pi CPUFREQ driver in the ARM64 defconfig file

* tag 'arm-soc/for-5.4/defconfig-arm64' of https://github.com/Broadcom/stblinux:
  arm64: defconfig: enable cpufreq support for RPi3
---

6729303cb6bca32e1803ee06e6782a4062873527
diff --cc arch/arm64/configs/defconfig
index 8007adf37db5,e80b40327912..6686faf54053
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -686,8 -677,8 +687,9 @@@ CONFIG_COMMON_CLK_CS2000_CP=
  CONFIG_COMMON_CLK_S2MPS11=y
  CONFIG_CLK_QORIQ=y
  CONFIG_COMMON_CLK_PWM=y
+ CONFIG_CLK_RASPBERRYPI=m
  CONFIG_CLK_IMX8MM=y
 +CONFIG_CLK_IMX8MN=y
  CONFIG_CLK_IMX8MQ=y
  CONFIG_CLK_IMX8QXP=y
  CONFIG_TI_SCI_CLK=y