Skip to content

Commit 96ce677

Browse files
author
Uwe Kleine-König
committed
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.
2 parents 84e351d + 976c462 commit 96ce677

File tree

4 files changed

+50
-62
lines changed

4 files changed

+50
-62
lines changed

arch/arm/configs/multi_v7_defconfig

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,25 +1121,6 @@ CONFIG_QCOM_SMSM=y
11211121
CONFIG_QCOM_SOCINFO=m
11221122
CONFIG_QCOM_STATS=m
11231123
CONFIG_QCOM_WCNSS_CTRL=m
1124-
CONFIG_ARCH_EMEV2=y
1125-
CONFIG_ARCH_R8A7794=y
1126-
CONFIG_ARCH_R8A7779=y
1127-
CONFIG_ARCH_R8A7790=y
1128-
CONFIG_ARCH_R8A7778=y
1129-
CONFIG_ARCH_R8A7793=y
1130-
CONFIG_ARCH_R8A7791=y
1131-
CONFIG_ARCH_R8A7792=y
1132-
CONFIG_ARCH_R8A7740=y
1133-
CONFIG_ARCH_R8A73A4=y
1134-
CONFIG_ARCH_R7S72100=y
1135-
CONFIG_ARCH_R7S9210=y
1136-
CONFIG_ARCH_R8A77470=y
1137-
CONFIG_ARCH_R8A7745=y
1138-
CONFIG_ARCH_R8A7742=y
1139-
CONFIG_ARCH_R8A7743=y
1140-
CONFIG_ARCH_R8A7744=y
1141-
CONFIG_ARCH_R9A06G032=y
1142-
CONFIG_ARCH_SH73A0=y
11431124
CONFIG_ROCKCHIP_IODOMAIN=y
11441125
CONFIG_ARCH_TEGRA_2x_SOC=y
11451126
CONFIG_ARCH_TEGRA_3x_SOC=y

arch/arm/configs/shmobile_defconfig

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ CONFIG_SMSC_PHY=y
6363
CONFIG_CAN_RCAR=y
6464
CONFIG_INPUT_EVDEV=y
6565
CONFIG_KEYBOARD_GPIO=y
66+
CONFIG_KEYBOARD_GPIO_POLLED=y
6667
# CONFIG_INPUT_MOUSE is not set
6768
CONFIG_INPUT_TOUCHSCREEN=y
6869
CONFIG_TOUCHSCREEN_EDT_FT5X06=y
@@ -84,6 +85,7 @@ CONFIG_SERIAL_8250_EM=y
8485
CONFIG_SERIAL_SH_SCI=y
8586
CONFIG_I2C_CHARDEV=y
8687
CONFIG_I2C_DEMUX_PINCTRL=y
88+
CONFIG_I2C_DESIGNWARE_CORE=y
8789
CONFIG_I2C_EMEV2=y
8890
CONFIG_I2C_GPIO=y
8991
CONFIG_I2C_RIIC=y
@@ -104,7 +106,7 @@ CONFIG_GPIO_PCF857X=y
104106
CONFIG_POWER_RESET=y
105107
CONFIG_POWER_RESET_RMOBILE=y
106108
CONFIG_POWER_SUPPLY=y
107-
# CONFIG_HWMON is not set
109+
CONFIG_SENSORS_LM75=y
108110
CONFIG_THERMAL=y
109111
CONFIG_CPU_THERMAL=y
110112
CONFIG_RCAR_THERMAL=y
@@ -174,6 +176,9 @@ CONFIG_USB_RENESAS_USBHS_UDC=y
174176
CONFIG_USB_RENESAS_USBF=y
175177
CONFIG_USB_ETH=y
176178
CONFIG_MMC=y
179+
CONFIG_MMC_SDHCI=y
180+
CONFIG_MMC_SDHCI_PLTFM=y
181+
CONFIG_MMC_SDHCI_OF_ARASAN=y
177182
CONFIG_MMC_SDHI=y
178183
CONFIG_MMC_SH_MMCIF=y
179184
CONFIG_NEW_LEDS=y
@@ -195,25 +200,6 @@ CONFIG_RCAR_DMAC=y
195200
CONFIG_RENESAS_USB_DMAC=y
196201
CONFIG_RZ_DMAC=y
197202
# CONFIG_IOMMU_SUPPORT is not set
198-
CONFIG_ARCH_EMEV2=y
199-
CONFIG_ARCH_R8A7794=y
200-
CONFIG_ARCH_R8A7779=y
201-
CONFIG_ARCH_R8A7790=y
202-
CONFIG_ARCH_R8A7778=y
203-
CONFIG_ARCH_R8A7793=y
204-
CONFIG_ARCH_R8A7791=y
205-
CONFIG_ARCH_R8A7792=y
206-
CONFIG_ARCH_R8A7740=y
207-
CONFIG_ARCH_R8A73A4=y
208-
CONFIG_ARCH_R7S72100=y
209-
CONFIG_ARCH_R7S9210=y
210-
CONFIG_ARCH_R8A77470=y
211-
CONFIG_ARCH_R8A7745=y
212-
CONFIG_ARCH_R8A7742=y
213-
CONFIG_ARCH_R8A7743=y
214-
CONFIG_ARCH_R8A7744=y
215-
CONFIG_ARCH_R9A06G032=y
216-
CONFIG_ARCH_SH73A0=y
217203
CONFIG_IIO=y
218204
CONFIG_AK8975=y
219205
CONFIG_PWM=y

arch/arm64/configs/defconfig

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,6 +1010,7 @@ CONFIG_SND_SOC_ROCKCHIP_RT5645=m
10101010
CONFIG_SND_SOC_RK3399_GRU_SOUND=m
10111011
CONFIG_SND_SOC_SAMSUNG=y
10121012
CONFIG_SND_SOC_RCAR=m
1013+
CONFIG_SND_SOC_MSIOF=m
10131014
CONFIG_SND_SOC_RZ=m
10141015
CONFIG_SND_SOC_SOF_TOPLEVEL=y
10151016
CONFIG_SND_SOC_SOF_OF=y
@@ -1474,29 +1475,6 @@ CONFIG_QCOM_WCNSS_CTRL=m
14741475
CONFIG_QCOM_APR=m
14751476
CONFIG_QCOM_ICC_BWMON=m
14761477
CONFIG_QCOM_PBS=m
1477-
CONFIG_ARCH_R8A77995=y
1478-
CONFIG_ARCH_R8A77990=y
1479-
CONFIG_ARCH_R8A77951=y
1480-
CONFIG_ARCH_R8A77965=y
1481-
CONFIG_ARCH_R8A77960=y
1482-
CONFIG_ARCH_R8A77961=y
1483-
CONFIG_ARCH_R8A779F0=y
1484-
CONFIG_ARCH_R8A77980=y
1485-
CONFIG_ARCH_R8A77970=y
1486-
CONFIG_ARCH_R8A779A0=y
1487-
CONFIG_ARCH_R8A779G0=y
1488-
CONFIG_ARCH_R8A779H0=y
1489-
CONFIG_ARCH_R8A774C0=y
1490-
CONFIG_ARCH_R8A774E1=y
1491-
CONFIG_ARCH_R8A774A1=y
1492-
CONFIG_ARCH_R8A774B1=y
1493-
CONFIG_ARCH_R9A07G043=y
1494-
CONFIG_ARCH_R9A07G044=y
1495-
CONFIG_ARCH_R9A07G054=y
1496-
CONFIG_ARCH_R9A08G045=y
1497-
CONFIG_ARCH_R9A09G011=y
1498-
CONFIG_ARCH_R9A09G047=y
1499-
CONFIG_ARCH_R9A09G057=y
15001478
CONFIG_ROCKCHIP_IODOMAIN=y
15011479
CONFIG_ARCH_TEGRA_132_SOC=y
15021480
CONFIG_ARCH_TEGRA_210_SOC=y
@@ -1553,6 +1531,7 @@ CONFIG_PWM_MEDIATEK=m
15531531
CONFIG_PWM_RCAR=m
15541532
CONFIG_PWM_RENESAS_TPU=m
15551533
CONFIG_PWM_ROCKCHIP=y
1534+
CONFIG_PWM_RZG2L_GPT=m
15561535
CONFIG_PWM_RZ_MTU3=m
15571536
CONFIG_PWM_SAMSUNG=y
15581537
CONFIG_PWM_SL28CPLD=m

0 commit comments

Comments
 (0)