[PATCH LOCAL] arm64: renesas_defconfig: Refresh for v5.1-rc1

[PATCH LOCAL] arm64: renesas_defconfig: Refresh for v5.1-rc1

[Geert Uytterhoeven]

Update the defconfig for Renesas R-Car Gen3 boards:
  - Move CMA-related config options (moved in commit ddb26d8e1e97af23
    ("dma-mapping: move CONFIG_DMA_CMA to kernel/dma/Kconfig"),
  - Drop CONFIG_CAVIUM_PTP=n (not enabled by default since commit
    e8c32c32b48c2e88 ("net: Don't default Cavium PTP driver to 'y'")),
  - Drop CONFIG_DRM_RCAR_LVDS=y (auto-enabled since commit
    02f2b30032c12b1b ("drm: rcar-du: lvds: Add API to enable/disable
    clock output")),
  - Drop CONFIG_SND_SIMPLE_SCU_CARD=y (removed in commit
    c8ed6aca6b824018 ("ASoC: simple-scu-card: remove simple-scu-card")).

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm64/configs/renesas_defconfig | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/arch/arm64/configs/renesas_defconfig b/arch/arm64/configs/renesas_defconfig
index 5561d30a3f270e26..1c4cbf4b936f60f0 100644
--- a/arch/arm64/configs/renesas_defconfig
+++ b/arch/arm64/configs/renesas_defconfig
@@ -91,9 +91,6 @@ CONFIG_PCIE_RCAR=y
 CONFIG_PCI_HOST_GENERIC=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_DMA_CMA=y
-CONFIG_CMA_SIZE_MBYTES=128
-CONFIG_CMA_ALIGNMENT=9
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_SPI_NOR=y
@@ -110,7 +107,6 @@ CONFIG_SATA_RCAR=y
 CONFIG_NETDEVICES=y
 CONFIG_TUN=y
 CONFIG_VIRTIO_NET=y
-# CONFIG_CAVIUM_PTP is not set
 CONFIG_RAVB=y
 CONFIG_MDIO_BUS_MUX_MMIOREG=y
 CONFIG_MICREL_PHY=y
@@ -210,7 +206,6 @@ CONFIG_VIDEO_ADV748X=y
 CONFIG_DRM=y
 CONFIG_DRM_RCAR_DU=y
 CONFIG_DRM_RCAR_DW_HDMI=y
-CONFIG_DRM_RCAR_LVDS=y
 CONFIG_DRM_DUMB_VGA_DAC=y
 CONFIG_DRM_THINE_THC63LVD1024=y
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=y
@@ -233,7 +228,6 @@ CONFIG_SND_SOC_RCAR=y
 CONFIG_SND_SOC_AK4613=y
 CONFIG_SND_SOC_PCM3168A_I2C=y
 CONFIG_SND_SIMPLE_CARD=y
-CONFIG_SND_SIMPLE_SCU_CARD=y
 CONFIG_SND_AUDIO_GRAPH_CARD=y
 CONFIG_USB=y
 CONFIG_USB_OTG=y
@@ -327,6 +321,9 @@ CONFIG_NLS_ISO8859_1=y
 CONFIG_CRYPTO_ANSI_CPRNG=y
 # CONFIG_CRYPTO_DEV_VIRTIO is not set
 CONFIG_CRYPTO_DEV_CCREE=y
+CONFIG_DMA_CMA=y
+CONFIG_CMA_SIZE_MBYTES=128
+CONFIG_CMA_ALIGNMENT=9
 CONFIG_PRINTK_TIME=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
-- 
2.17.1

Re: [PATCH LOCAL] arm64: renesas_defconfig: Refresh for v5.1-rc1

[Simon Horman]

On Mon, Apr 01, 2019 at 01:57:23PM +0200, Geert Uytterhoeven wrote:
> Update the defconfig for Renesas R-Car Gen3 boards:
>   - Move CMA-related config options (moved in commit ddb26d8e1e97af23
>     ("dma-mapping: move CONFIG_DMA_CMA to kernel/dma/Kconfig"),
>   - Drop CONFIG_CAVIUM_PTP=n (not enabled by default since commit
>     e8c32c32b48c2e88 ("net: Don't default Cavium PTP driver to 'y'")),
>   - Drop CONFIG_DRM_RCAR_LVDS=y (auto-enabled since commit
>     02f2b30032c12b1b ("drm: rcar-du: lvds: Add API to enable/disable
>     clock output")),
>   - Drop CONFIG_SND_SIMPLE_SCU_CARD=y (removed in commit
>     c8ed6aca6b824018 ("ASoC: simple-scu-card: remove simple-scu-card")).
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Thanks,

I have applied this to the topic/renesas-defconfig branch which is included
in the devel branch and tags of the Renesas tree as a convenience to
developers.  The branch is not, however, included in the next branch or
tags nor is it targeted at upstream.