[PATCH] ARM: shmobile: defconfig: Refresh for v7.4-rc1

[Geert Uytterhoeven]

Refresh the defconfig for Renesas ARM systems:
  - Move CONFIG_SPI_SH_MSIOF=y (moved in commit d696b9109d2315fc ("spi:
    Fix the section ordering in accordance with the comment")),
  - Disable CONFIG_DRM_RCAR_USE_DSC (defaults to yes since commit
    c217ce005b232899 ("drm/rcar-du: dsc: Add rudimentary Renesas R-Car
    V4H DSC driver"), but only used on R-Car V4H),
  - Enable RZ/N1 timer support.

Signed-off-by: Geert Uytterhoeven <geert+renesas at glider.be>
---
To be queued in renesas-devel for v7.5.
---
 arch/arm/configs/shmobile_defconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index 58059f943a9b307c..3683276dd82ebd26 100644
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -94,8 +94,8 @@ CONFIG_I2C_RCAR=y
 CONFIG_I2C_SLAVE_EEPROM=y
 CONFIG_SPI=y
 CONFIG_SPI_RSPI=y
-CONFIG_SPI_SH_MSIOF=y
 CONFIG_SPI_SH_HSPI=y
+CONFIG_SPI_SH_MSIOF=y
 CONFIG_PINCTRL_RZA1=y
 CONFIG_PINCTRL_RZA2=y
 CONFIG_PINCTRL_RZN1=y
@@ -149,6 +149,7 @@ CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_PANEL_EDP=y
 CONFIG_DRM_PANEL_SIMPLE=y
 CONFIG_DRM_RCAR_DU=y
+# CONFIG_DRM_RCAR_USE_DSC is not set
 # CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
 CONFIG_DRM_SHMOBILE=y
 CONFIG_FB_DEVICE=y
@@ -199,6 +200,7 @@ CONFIG_RZN1_DMAMUX=y
 CONFIG_RCAR_DMAC=y
 CONFIG_RENESAS_USB_DMAC=y
 CONFIG_RZ_DMAC=y
+CONFIG_RZN1_TIMER=y
 CONFIG_ARM_GT_INITIAL_PRESCALER_VAL=1
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_IIO=y
-- 
2.43.0