Commit 96ce677a authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

Merge tag 'renesas-arm-defconfig-for-v6.16-tag2' of... 

Merge tag 'renesas-arm-defconfig-for-v6.16-tag2' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into pwm/for-next

Renesas ARM defconfig updates for v6.16 (take two)

  - Enable modular support for the Renesas RZ/G2L GPT and MSIOF sound in
    the ARM64 defconfig,
  - Enable more support for RZN1D-DB/EB in shmobile_defconfig.

It is merged into the pwm tree due to the next patch renaming
PWM_RZG2L_GPT which has a use added in the arm64 defconfig.
parents 84e351d8 976c4626

arch/arm/configs/multi_v7_defconfig

+0 −19
Original line number Diff line number Diff line
@@ -1121,25 +1121,6 @@ CONFIG_QCOM_SMSM=y 
CONFIG_QCOM_SOCINFO=m

CONFIG_QCOM_STATS=m

CONFIG_QCOM_WCNSS_CTRL=m

CONFIG_ARCH_EMEV2=y

CONFIG_ARCH_R8A7794=y

CONFIG_ARCH_R8A7779=y

CONFIG_ARCH_R8A7790=y

CONFIG_ARCH_R8A7778=y

CONFIG_ARCH_R8A7793=y

CONFIG_ARCH_R8A7791=y

CONFIG_ARCH_R8A7792=y

CONFIG_ARCH_R8A7740=y

CONFIG_ARCH_R8A73A4=y

CONFIG_ARCH_R7S72100=y

CONFIG_ARCH_R7S9210=y

CONFIG_ARCH_R8A77470=y

CONFIG_ARCH_R8A7745=y

CONFIG_ARCH_R8A7742=y

CONFIG_ARCH_R8A7743=y

CONFIG_ARCH_R8A7744=y

CONFIG_ARCH_R9A06G032=y

CONFIG_ARCH_SH73A0=y

CONFIG_ROCKCHIP_IODOMAIN=y

CONFIG_ARCH_TEGRA_2x_SOC=y

CONFIG_ARCH_TEGRA_3x_SOC=y

arch/arm/configs/shmobile_defconfig

+6 −20
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ CONFIG_SMSC_PHY=y 
CONFIG_CAN_RCAR=y

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

CONFIG_KEYBOARD_GPIO_POLLED=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_EDT_FT5X06=y
@@ -84,6 +85,7 @@ CONFIG_SERIAL_8250_EM=y 
CONFIG_SERIAL_SH_SCI=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_DEMUX_PINCTRL=y

CONFIG_I2C_DESIGNWARE_CORE=y

CONFIG_I2C_EMEV2=y

CONFIG_I2C_GPIO=y

CONFIG_I2C_RIIC=y
@@ -104,7 +106,7 @@ CONFIG_GPIO_PCF857X=y 
CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_RMOBILE=y

CONFIG_POWER_SUPPLY=y

# CONFIG_HWMON is not set

CONFIG_SENSORS_LM75=y

CONFIG_THERMAL=y

CONFIG_CPU_THERMAL=y

CONFIG_RCAR_THERMAL=y
@@ -174,6 +176,9 @@ CONFIG_USB_RENESAS_USBHS_UDC=y 
CONFIG_USB_RENESAS_USBF=y

CONFIG_USB_ETH=y

CONFIG_MMC=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_OF_ARASAN=y

CONFIG_MMC_SDHI=y

CONFIG_MMC_SH_MMCIF=y

CONFIG_NEW_LEDS=y
@@ -195,25 +200,6 @@ CONFIG_RCAR_DMAC=y 
CONFIG_RENESAS_USB_DMAC=y

CONFIG_RZ_DMAC=y

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_ARCH_EMEV2=y

CONFIG_ARCH_R8A7794=y

CONFIG_ARCH_R8A7779=y

CONFIG_ARCH_R8A7790=y

CONFIG_ARCH_R8A7778=y

CONFIG_ARCH_R8A7793=y

CONFIG_ARCH_R8A7791=y

CONFIG_ARCH_R8A7792=y

CONFIG_ARCH_R8A7740=y

CONFIG_ARCH_R8A73A4=y

CONFIG_ARCH_R7S72100=y

CONFIG_ARCH_R7S9210=y

CONFIG_ARCH_R8A77470=y

CONFIG_ARCH_R8A7745=y

CONFIG_ARCH_R8A7742=y

CONFIG_ARCH_R8A7743=y

CONFIG_ARCH_R8A7744=y

CONFIG_ARCH_R9A06G032=y

CONFIG_ARCH_SH73A0=y

CONFIG_IIO=y

CONFIG_AK8975=y

CONFIG_PWM=y

arch/arm64/configs/defconfig

+2 −23
Original line number Diff line number Diff line
@@ -1010,6 +1010,7 @@ CONFIG_SND_SOC_ROCKCHIP_RT5645=m 
CONFIG_SND_SOC_RK3399_GRU_SOUND=m

CONFIG_SND_SOC_SAMSUNG=y

CONFIG_SND_SOC_RCAR=m

CONFIG_SND_SOC_MSIOF=m

CONFIG_SND_SOC_RZ=m

CONFIG_SND_SOC_SOF_TOPLEVEL=y

CONFIG_SND_SOC_SOF_OF=y
@@ -1474,29 +1475,6 @@ CONFIG_QCOM_WCNSS_CTRL=m 
CONFIG_QCOM_APR=m

CONFIG_QCOM_ICC_BWMON=m

CONFIG_QCOM_PBS=m

CONFIG_ARCH_R8A77995=y

CONFIG_ARCH_R8A77990=y

CONFIG_ARCH_R8A77951=y

CONFIG_ARCH_R8A77965=y

CONFIG_ARCH_R8A77960=y

CONFIG_ARCH_R8A77961=y

CONFIG_ARCH_R8A779F0=y

CONFIG_ARCH_R8A77980=y

CONFIG_ARCH_R8A77970=y

CONFIG_ARCH_R8A779A0=y

CONFIG_ARCH_R8A779G0=y

CONFIG_ARCH_R8A779H0=y

CONFIG_ARCH_R8A774C0=y

CONFIG_ARCH_R8A774E1=y

CONFIG_ARCH_R8A774A1=y

CONFIG_ARCH_R8A774B1=y

CONFIG_ARCH_R9A07G043=y

CONFIG_ARCH_R9A07G044=y

CONFIG_ARCH_R9A07G054=y

CONFIG_ARCH_R9A08G045=y

CONFIG_ARCH_R9A09G011=y

CONFIG_ARCH_R9A09G047=y

CONFIG_ARCH_R9A09G057=y

CONFIG_ROCKCHIP_IODOMAIN=y

CONFIG_ARCH_TEGRA_132_SOC=y

CONFIG_ARCH_TEGRA_210_SOC=y
@@ -1553,6 +1531,7 @@ CONFIG_PWM_MEDIATEK=m 
CONFIG_PWM_RCAR=m

CONFIG_PWM_RENESAS_TPU=m

CONFIG_PWM_ROCKCHIP=y

CONFIG_PWM_RZG2L_GPT=m

CONFIG_PWM_RZ_MTU3=m

CONFIG_PWM_SAMSUNG=y

CONFIG_PWM_SL28CPLD=m

drivers/soc/renesas/Kconfig

+42 −0
Original line number Diff line number Diff line
@@ -65,17 +65,20 @@ if ARM && ARCH_RENESAS 


config ARCH_EMEV2

	bool "ARM32 Platform support for Emma Mobile EV2"

	default ARCH_RENESAS

	select HAVE_ARM_SCU if SMP

	select SYS_SUPPORTS_EM_STI



config ARCH_R8A7794

	bool "ARM32 Platform support for R-Car E2"

	default ARCH_RENESAS

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_814220

	select SYSC_R8A7794



config ARCH_R8A7779

	bool "ARM32 Platform support for R-Car H1"

	default ARCH_RENESAS

	select ARCH_RCAR_GEN1

	select ARM_ERRATA_754322

	select ARM_GLOBAL_TIMER
@@ -85,6 +88,7 @@ config ARCH_R8A7779 


config ARCH_R8A7790

	bool "ARM32 Platform support for R-Car H2"

	default ARCH_RENESAS

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_798181 if SMP

	select ARM_ERRATA_814220
@@ -93,11 +97,13 @@ config ARCH_R8A7790 


config ARCH_R8A7778

	bool "ARM32 Platform support for R-Car M1A"

	default ARCH_RENESAS

	select ARCH_RCAR_GEN1

	select ARM_ERRATA_754322



config ARCH_R8A7793

	bool "ARM32 Platform support for R-Car M2-N"

	default ARCH_RENESAS

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_798181 if SMP

	select I2C
@@ -105,6 +111,7 @@ config ARCH_R8A7793 


config ARCH_R8A7791

	bool "ARM32 Platform support for R-Car M2-W"

	default ARCH_RENESAS

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_798181 if SMP

	select I2C
@@ -112,18 +119,21 @@ config ARCH_R8A7791 


config ARCH_R8A7792

	bool "ARM32 Platform support for R-Car V2H"

	default ARCH_RENESAS

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_798181 if SMP

	select SYSC_R8A7792



config ARCH_R8A7740

	bool "ARM32 Platform support for R-Mobile A1"

	default ARCH_RENESAS

	select ARCH_RMOBILE

	select ARM_ERRATA_754322

	select RENESAS_INTC_IRQPIN



config ARCH_R8A73A4

	bool "ARM32 Platform support for R-Mobile APE6"

	default ARCH_RENESAS

	select ARCH_RMOBILE

	select ARM_ERRATA_798181 if SMP

	select ARM_ERRATA_814220
@@ -132,6 +142,7 @@ config ARCH_R8A73A4 


config ARCH_R7S72100

	bool "ARM32 Platform support for RZ/A1H"

	default ARCH_RENESAS

	select ARM_ERRATA_754322

	select PM

	select PM_GENERIC_DOMAINS
@@ -141,6 +152,7 @@ config ARCH_R7S72100 


config ARCH_R7S9210

	bool "ARM32 Platform support for RZ/A2"

	default ARCH_RENESAS

	select PM

	select PM_GENERIC_DOMAINS

	select RENESAS_OSTM
@@ -148,18 +160,21 @@ config ARCH_R7S9210 


config ARCH_R8A77470

	bool "ARM32 Platform support for RZ/G1C"

	default ARCH_RENESAS

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_814220

	select SYSC_R8A77470



config ARCH_R8A7745

	bool "ARM32 Platform support for RZ/G1E"

	default ARCH_RENESAS

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_814220

	select SYSC_R8A7745



config ARCH_R8A7742

	bool "ARM32 Platform support for RZ/G1H"

	default ARCH_RENESAS

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_798181 if SMP

	select ARM_ERRATA_814220
@@ -167,23 +182,27 @@ config ARCH_R8A7742 


config ARCH_R8A7743

	bool "ARM32 Platform support for RZ/G1M"

	default ARCH_RENESAS

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_798181 if SMP

	select SYSC_R8A7743



config ARCH_R8A7744

	bool "ARM32 Platform support for RZ/G1N"

	default ARCH_RENESAS

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_798181 if SMP

	select SYSC_R8A7743



config ARCH_R9A06G032

	bool "ARM32 Platform support for RZ/N1D"

	default ARCH_RENESAS

	select ARCH_RZN1

	select ARM_ERRATA_814220



config ARCH_SH73A0

	bool "ARM32 Platform support for SH-Mobile AG5"

	default ARCH_RENESAS

	select ARCH_RMOBILE

	select ARM_ERRATA_754322

	select ARM_GLOBAL_TIMER
@@ -197,6 +216,7 @@ if ARM64 


config ARCH_R8A77995

	bool "ARM64 Platform support for R-Car D3"

	default y if ARCH_RENESAS

	select ARCH_RCAR_GEN3

	select SYSC_R8A77995

	help
@@ -205,6 +225,7 @@ config ARCH_R8A77995 


config ARCH_R8A77990

	bool "ARM64 Platform support for R-Car E3"

	default y if ARCH_RENESAS

	select ARCH_RCAR_GEN3

	select SYSC_R8A77990

	help
@@ -213,6 +234,7 @@ config ARCH_R8A77990 


config ARCH_R8A77951

	bool "ARM64 Platform support for R-Car H3 ES2.0+"

	default y if ARCH_RENESAS

	select ARCH_RCAR_GEN3

	select SYSC_R8A7795

	help
@@ -222,6 +244,7 @@ config ARCH_R8A77951 


config ARCH_R8A77965

	bool "ARM64 Platform support for R-Car M3-N"

	default y if ARCH_RENESAS

	select ARCH_RCAR_GEN3

	select SYSC_R8A77965

	help
@@ -230,6 +253,7 @@ config ARCH_R8A77965 


config ARCH_R8A77960

	bool "ARM64 Platform support for R-Car M3-W"

	default y if ARCH_RENESAS

	select ARCH_RCAR_GEN3

	select SYSC_R8A77960

	help
@@ -237,6 +261,7 @@ config ARCH_R8A77960 


config ARCH_R8A77961

	bool "ARM64 Platform support for R-Car M3-W+"

	default y if ARCH_RENESAS

	select ARCH_RCAR_GEN3

	select SYSC_R8A77961

	help
@@ -245,6 +270,7 @@ config ARCH_R8A77961 


config ARCH_R8A779F0

	bool "ARM64 Platform support for R-Car S4-8"

	default y if ARCH_RENESAS

	select ARCH_RCAR_GEN4

	select SYSC_R8A779F0

	help
@@ -252,6 +278,7 @@ config ARCH_R8A779F0 


config ARCH_R8A77980

	bool "ARM64 Platform support for R-Car V3H"

	default y if ARCH_RENESAS

	select ARCH_RCAR_GEN3

	select SYSC_R8A77980

	help
@@ -259,6 +286,7 @@ config ARCH_R8A77980 


config ARCH_R8A77970

	bool "ARM64 Platform support for R-Car V3M"

	default y if ARCH_RENESAS

	select ARCH_RCAR_GEN3

	select SYSC_R8A77970

	help
@@ -266,6 +294,7 @@ config ARCH_R8A77970 


config ARCH_R8A779A0

	bool "ARM64 Platform support for R-Car V3U"

	default y if ARCH_RENESAS

	select ARCH_RCAR_GEN4

	select SYSC_R8A779A0

	help
@@ -273,6 +302,7 @@ config ARCH_R8A779A0 


config ARCH_R8A779G0

	bool "ARM64 Platform support for R-Car V4H"

	default y if ARCH_RENESAS

	select ARCH_RCAR_GEN4

	select SYSC_R8A779G0

	help
@@ -280,6 +310,7 @@ config ARCH_R8A779G0 


config ARCH_R8A779H0

	bool "ARM64 Platform support for R-Car V4M"

	default y if ARCH_RENESAS

	select ARCH_RCAR_GEN4

	select SYSC_R8A779H0

	help
@@ -287,6 +318,7 @@ config ARCH_R8A779H0 


config ARCH_R8A774C0

	bool "ARM64 Platform support for RZ/G2E"

	default y if ARCH_RENESAS

	select ARCH_RCAR_GEN3

	select SYSC_R8A774C0

	help
@@ -294,6 +326,7 @@ config ARCH_R8A774C0 


config ARCH_R8A774E1

	bool "ARM64 Platform support for RZ/G2H"

	default y if ARCH_RENESAS

	select ARCH_RCAR_GEN3

	select SYSC_R8A774E1

	help
@@ -301,6 +334,7 @@ config ARCH_R8A774E1 


config ARCH_R8A774A1

	bool "ARM64 Platform support for RZ/G2M"

	default y if ARCH_RENESAS

	select ARCH_RCAR_GEN3

	select SYSC_R8A774A1

	help
@@ -308,6 +342,7 @@ config ARCH_R8A774A1 


config ARCH_R8A774B1

	bool "ARM64 Platform support for RZ/G2N"

	default y if ARCH_RENESAS

	select ARCH_RCAR_GEN3

	select SYSC_R8A774B1

	help
@@ -315,24 +350,28 @@ config ARCH_R8A774B1 


config ARCH_R9A07G043

	bool "ARM64 Platform support for RZ/G2UL"

	default y if ARCH_RENESAS

	select ARCH_RZG2L

	help

	  This enables support for the Renesas RZ/G2UL SoC variants.



config ARCH_R9A07G044

	bool "ARM64 Platform support for RZ/G2L"

	default y if ARCH_RENESAS

	select ARCH_RZG2L

	help

	  This enables support for the Renesas RZ/G2L SoC variants.



config ARCH_R9A07G054

	bool "ARM64 Platform support for RZ/V2L"

	default y if ARCH_RENESAS

	select ARCH_RZG2L

	help

	  This enables support for the Renesas RZ/V2L SoC variants.



config ARCH_R9A08G045

	bool "ARM64 Platform support for RZ/G3S"

	default y if ARCH_RENESAS

	select ARCH_RZG2L

	select SYSC_R9A08G045

	help
@@ -340,6 +379,7 @@ config ARCH_R9A08G045 


config ARCH_R9A09G011

	bool "ARM64 Platform support for RZ/V2M"

	default y if ARCH_RENESAS

	select PM

	select PM_GENERIC_DOMAINS

	select PWC_RZV2M
@@ -348,12 +388,14 @@ config ARCH_R9A09G011 


config ARCH_R9A09G047

	bool "ARM64 Platform support for RZ/G3E"

	default y if ARCH_RENESAS

	select SYS_R9A09G047

	help

	  This enables support for the Renesas RZ/G3E SoC variants.



config ARCH_R9A09G057

	bool "ARM64 Platform support for RZ/V2H(P)"

	default y if ARCH_RENESAS

	select RENESAS_RZV2H_ICU

	select SYS_R9A09G057

	help