Skip to content
This repository was archived by the owner on Feb 9, 2023. It is now read-only.

Commit adbc128

Browse files
torvaldstorvalds
committed
Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC platform updates from Arnd Bergmann: "These are mostly minor bugfixes, cleanup and many defconfig updates to support added drivers. In particular OMAP and PXA keep cleaning up the legacy code base, as usual. Nvidia adds some more SoC support code for Tegra 186. For the first time on years, we are actually adding a non-DT platform for the EP93xx based Liebherr controller BK3.1. It's a minor variation of the EP93xx reference design and in active use, while EP93xx apparently doesn't have enough new development to have any device tree support" * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (73 commits) ARM: omap: hwmod: fix section mismatch warnings ARM: pxa/tosa-bt: add MODULE_LICENSE tag arm64: defconfig: enable CONFIG_ACPI_APEI_EINJ arm64: defconfig: enable EDAC GHES option arm64: defconfig: enable CONFIG_ACPI_APEI_MEMORY_FAILURE ARM: imx_v6_v7_defconfig: enable CONFIG_CPU_FREQ_STAT Wind down ARM/TANGO port ARM: davinci: constify gpio_led ARM: davinci: drop unneeded newline soc: Add SoC driver for Gemini ARM: SAMSUNG: Add SPDX license identifiers ARM: S5PV210: Add SPDX license identifiers ARM: S3C64XX: Add SPDX license identifiers ARM: S3C24XX: Add SPDX license identifiers ARM: EXYNOS: Add SPDX license identifiers ARM: imx: remove unused imx3 pm definitions ARM: imx: don't abort MMDC probe if power saving status doesn't match ARM: imx_v6_v7_defconfig: enable RTC_DRV_MXC_V2 ARM: imx_v6_v7_defconfig: Add missing config for DART-MX6 SoM ARM: davinci: Use PTR_ERR_OR_ZERO() ...
2 parents 537433b + 0ca14cd commit adbc128

307 files changed

Lines changed: 1947 additions & 2989 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎MAINTAINERS‎

Lines changed: 36 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1278,6 +1278,12 @@ L: [email protected] (moderated for non-subscribers)
12781278
S: Supported
12791279
F: drivers/net/ethernet/cavium/thunder/
12801280

1281+
ARM/CIRRUS LOGIC BK3 MACHINE SUPPORT
1282+
M: Lukasz Majewski <[email protected]>
1283+
L: [email protected] (moderated for non-subscribers)
1284+
S: Maintained
1285+
F: arch/arm/mach-ep93xx/ts72xx.c
1286+
12811287
ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE
12821288
M: Alexander Shiyan <[email protected]>
12831289
L: [email protected] (moderated for non-subscribers)
@@ -1662,14 +1668,38 @@ ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
16621668
M: Michael Petchkovsky <[email protected]>
16631669
S: Maintained
16641670

1665-
ARM/NOMADIK ARCHITECTURE
1666-
M: Alessandro Rubini <[email protected]>
1671+
ARM/NOMADIK/U300/Ux500 ARCHITECTURES
16671672
M: Linus Walleij <[email protected]>
16681673
L: [email protected] (moderated for non-subscribers)
16691674
S: Maintained
16701675
F: arch/arm/mach-nomadik/
1671-
F: drivers/pinctrl/nomadik/
1676+
F: arch/arm/mach-u300/
1677+
F: arch/arm/mach-ux500/
1678+
F: arch/arm/boot/dts/ste-*
1679+
F: drivers/clk/clk-nomadik.c
1680+
F: drivers/clk/clk-u300.c
1681+
F: drivers/clocksource/clksrc-dbx500-prcmu.c
1682+
F: drivers/clocksource/timer-u300.c
1683+
F: drivers/dma/coh901318*
1684+
F: drivers/dma/ste_dma40*
1685+
F: drivers/hwspinlock/u8500_hsem.c
16721686
F: drivers/i2c/busses/i2c-nomadik.c
1687+
F: drivers/i2c/busses/i2c-stu300.c
1688+
F: drivers/mfd/ab3100*
1689+
F: drivers/mfd/ab8500*
1690+
F: drivers/mfd/abx500*
1691+
F: drivers/mfd/dbx500*
1692+
F: drivers/mfd/db8500*
1693+
F: drivers/pinctrl/nomadik/
1694+
F: drivers/pinctrl/pinctrl-coh901*
1695+
F: drivers/pinctrl/pinctrl-u300.c
1696+
F: drivers/rtc/rtc-ab3100.c
1697+
F: drivers/rtc/rtc-ab8500.c
1698+
F: drivers/rtc/rtc-coh901331.c
1699+
F: drivers/rtc/rtc-pl031.c
1700+
F: drivers/watchdog/coh901327_wdt.c
1701+
F: Documentation/devicetree/bindings/arm/ste-*
1702+
F: Documentation/devicetree/bindings/arm/ux500/
16731703
T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git
16741704

16751705
ARM/NUVOTON W90X900 ARM ARCHITECTURE
@@ -1983,9 +2013,10 @@ N: stm32
19832013
F: drivers/clocksource/armv7m_systick.c
19842014

19852015
ARM/TANGO ARCHITECTURE
1986-
M: Marc Gonzalez <[email protected]>
2016+
M: Marc Gonzalez <[email protected]>
2017+
M: Mans Rullgard <[email protected]>
19872018
L: [email protected]
1988-
S: Maintained
2019+
S: Odd Fixes
19892020
N: tango
19902021

19912022
ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
@@ -2049,21 +2080,6 @@ M: Dmitry Eremin-Solenikov <[email protected]>
20492080
M: Dirk Opfer <[email protected]>
20502081
S: Maintained
20512082

2052-
ARM/U300 MACHINE SUPPORT
2053-
M: Linus Walleij <[email protected]>
2054-
L: [email protected] (moderated for non-subscribers)
2055-
S: Supported
2056-
F: arch/arm/mach-u300/
2057-
F: drivers/clocksource/timer-u300.c
2058-
F: drivers/i2c/busses/i2c-stu300.c
2059-
F: drivers/rtc/rtc-coh901331.c
2060-
F: drivers/watchdog/coh901327_wdt.c
2061-
F: drivers/dma/coh901318*
2062-
F: drivers/mfd/ab3100*
2063-
F: drivers/rtc/rtc-ab3100.c
2064-
F: drivers/rtc/rtc-coh901331.c
2065-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
2066-
20672083
ARM/UNIPHIER ARCHITECTURE
20682084
M: Masahiro Yamada <[email protected]>
20692085
L: [email protected] (moderated for non-subscribers)
@@ -2085,24 +2101,6 @@ F: drivers/reset/reset-uniphier.c
20852101
F: drivers/tty/serial/8250/8250_uniphier.c
20862102
N: uniphier
20872103

2088-
ARM/Ux500 ARM ARCHITECTURE
2089-
M: Linus Walleij <[email protected]>
2090-
L: [email protected] (moderated for non-subscribers)
2091-
S: Maintained
2092-
F: arch/arm/mach-ux500/
2093-
F: drivers/clocksource/clksrc-dbx500-prcmu.c
2094-
F: drivers/dma/ste_dma40*
2095-
F: drivers/hwspinlock/u8500_hsem.c
2096-
F: drivers/mfd/abx500*
2097-
F: drivers/mfd/ab8500*
2098-
F: drivers/mfd/dbx500*
2099-
F: drivers/mfd/db8500*
2100-
F: drivers/pinctrl/nomadik/pinctrl-ab*
2101-
F: drivers/pinctrl/nomadik/pinctrl-nomadik*
2102-
F: drivers/rtc/rtc-ab8500.c
2103-
F: drivers/rtc/rtc-pl031.c
2104-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
2105-
21062104
ARM/Ux500 CLOCK FRAMEWORK SUPPORT
21072105
M: Ulf Hansson <[email protected]>
21082106
L: [email protected] (moderated for non-subscribers)

‎arch/arm/configs/davinci_all_defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ CONFIG_PPP=m
9494
CONFIG_PPP_DEFLATE=m
9595
CONFIG_PPP_ASYNC=m
9696
CONFIG_PPP_SYNC_TTY=m
97+
CONFIG_USB_USBNET=m
9798
CONFIG_INPUT_EVDEV=m
9899
CONFIG_INPUT_EVBUG=m
99100
CONFIG_KEYBOARD_ATKBD=m

‎arch/arm/configs/exynos_defconfig‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ CONFIG_NO_HZ=y
33
CONFIG_HIGH_RES_TIMERS=y
44
CONFIG_CGROUPS=y
55
CONFIG_BLK_DEV_INITRD=y
6+
CONFIG_PERF_EVENTS=y
67
CONFIG_MODULES=y
78
CONFIG_MODULE_UNLOAD=y
89
CONFIG_PARTITION_ADVANCED=y
@@ -179,6 +180,7 @@ CONFIG_REGULATOR_TPS65090=y
179180
CONFIG_REGULATOR_WM8994=y
180181
CONFIG_MEDIA_SUPPORT=m
181182
CONFIG_MEDIA_CAMERA_SUPPORT=y
183+
CONFIG_MEDIA_CEC_SUPPORT=y
182184
CONFIG_MEDIA_CONTROLLER=y
183185
CONFIG_VIDEO_V4L2_SUBDEV_API=y
184186
CONFIG_MEDIA_USB_SUPPORT=y
@@ -195,6 +197,8 @@ CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
195197
CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
196198
CONFIG_V4L_TEST_DRIVERS=y
197199
CONFIG_VIDEO_VIVID=m
200+
CONFIG_CEC_PLATFORM_DRIVERS=y
201+
CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
198202
CONFIG_DRM=y
199203
CONFIG_DRM_EXYNOS=y
200204
CONFIG_DRM_EXYNOS_FIMD=y
@@ -207,6 +211,7 @@ CONFIG_DRM_PANEL_SAMSUNG_LD9040=y
207211
CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=y
208212
CONFIG_DRM_NXP_PTN3460=y
209213
CONFIG_DRM_PARADE_PS8622=y
214+
CONFIG_DRM_SII9234=y
210215
CONFIG_LCD_CLASS_DEVICE=y
211216
CONFIG_LCD_PLATFORM=y
212217
CONFIG_BACKLIGHT_PWM=y
@@ -218,6 +223,7 @@ CONFIG_SND_SOC_SAMSUNG=y
218223
CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=y
219224
CONFIG_SND_SOC_SMDK_WM8994_PCM=y
220225
CONFIG_SND_SOC_SNOW=y
226+
CONFIG_SND_SOC_ODROID=y
221227
CONFIG_SND_SIMPLE_CARD=y
222228
CONFIG_USB=y
223229
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
@@ -281,6 +287,7 @@ CONFIG_DEVFREQ_GOV_POWERSAVE=y
281287
CONFIG_DEVFREQ_GOV_USERSPACE=y
282288
CONFIG_ARM_EXYNOS_BUS_DEVFREQ=y
283289
CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP=y
290+
CONFIG_EXYNOS_IOMMU=y
284291
CONFIG_EXTCON=y
285292
CONFIG_EXTCON_MAX14577=y
286293
CONFIG_EXTCON_MAX77693=y

‎arch/arm/configs/imx_v6_v7_defconfig‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ CONFIG_FORCE_MAX_ZONEORDER=14
5555
CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
5656
CONFIG_KEXEC=y
5757
CONFIG_CPU_FREQ=y
58+
CONFIG_CPU_FREQ_STAT=y
5859
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
5960
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
6061
CONFIG_CPU_FREQ_GOV_USERSPACE=y
@@ -80,6 +81,7 @@ CONFIG_CAN=y
8081
CONFIG_CAN_FLEXCAN=y
8182
CONFIG_BT=y
8283
CONFIG_BT_HCIUART=y
84+
CONFIG_BT_HCIUART_SERDEV=y
8385
CONFIG_BT_HCIUART_H4=y
8486
CONFIG_BT_HCIUART_LL=y
8587
CONFIG_CFG80211=y
@@ -155,6 +157,7 @@ CONFIG_USB_USBNET=y
155157
CONFIG_USB_NET_CDC_EEM=m
156158
CONFIG_BRCMFMAC=m
157159
CONFIG_WL12XX=m
160+
CONFIG_WL18XX=m
158161
CONFIG_WLCORE_SDIO=m
159162
# CONFIG_WILINK_PLATFORM_DATA is not set
160163
CONFIG_INPUT_EVDEV=y
@@ -185,6 +188,8 @@ CONFIG_SERIAL_IMX=y
185188
CONFIG_SERIAL_IMX_CONSOLE=y
186189
CONFIG_SERIAL_FSL_LPUART=y
187190
CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
191+
CONFIG_SERIAL_DEV_BUS=y
192+
CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
188193
# CONFIG_I2C_COMPAT is not set
189194
CONFIG_I2C_CHARDEV=y
190195
CONFIG_I2C_MUX=y
@@ -248,6 +253,7 @@ CONFIG_VIDEO_OV5640=m
248253
CONFIG_SOC_CAMERA_OV2640=y
249254
CONFIG_IMX_IPUV3_CORE=y
250255
CONFIG_DRM=y
256+
CONFIG_DRM_PANEL_LVDS=y
251257
CONFIG_DRM_PANEL_SIMPLE=y
252258
CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
253259
CONFIG_DRM_DW_HDMI_CEC=y
@@ -340,6 +346,7 @@ CONFIG_LEDS_TRIGGER_ONESHOT=y
340346
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
341347
CONFIG_LEDS_TRIGGER_BACKLIGHT=y
342348
CONFIG_LEDS_TRIGGER_GPIO=y
349+
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
343350
CONFIG_RTC_CLASS=y
344351
CONFIG_RTC_INTF_DEV_UIE_EMUL=y
345352
CONFIG_RTC_DRV_DS1307=y
@@ -349,6 +356,7 @@ CONFIG_RTC_DRV_PCF8563=y
349356
CONFIG_RTC_DRV_M41T80=y
350357
CONFIG_RTC_DRV_MC13XXX=y
351358
CONFIG_RTC_DRV_MXC=y
359+
CONFIG_RTC_DRV_MXC_V2=y
352360
CONFIG_RTC_DRV_SNVS=y
353361
CONFIG_DMADEVICES=y
354362
CONFIG_FSL_EDMA=y

‎arch/arm/configs/keystone_defconfig‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,3 +228,10 @@ CONFIG_CRYPTO_DES=y
228228
CONFIG_CRYPTO_ANSI_CPRNG=y
229229
CONFIG_CRYPTO_USER_API_HASH=y
230230
CONFIG_CRYPTO_USER_API_SKCIPHER=y
231+
CONFIG_SPI_CADENCE_QUADSPI=y
232+
CONFIG_INPUT_MISC=y
233+
CONFIG_INPUT_EVDEV=m
234+
CONFIG_INPUT_GPIO_DECODER=m
235+
CONFIG_GPIO_PCA953X=m
236+
CONFIG_LEDS_TRIGGER_ACTIVITY=y
237+
CONFIG_LEDS_TRIGGER_CPU=y

‎arch/arm/configs/multi_v7_defconfig‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,18 @@ CONFIG_ARCH_ZYNQ=y
115115
CONFIG_TRUSTED_FOUNDATIONS=y
116116
CONFIG_PCI=y
117117
CONFIG_PCI_HOST_GENERIC=y
118+
CONFIG_PCI_DRA7XX=y
119+
CONFIG_PCI_DRA7XX_EP=y
118120
CONFIG_PCI_KEYSTONE=y
119121
CONFIG_PCI_MSI=y
120122
CONFIG_PCI_MVEBU=y
121123
CONFIG_PCI_TEGRA=y
122124
CONFIG_PCI_RCAR_GEN2=y
123125
CONFIG_PCIE_RCAR=y
124126
CONFIG_PCIEPORTBUS=y
127+
CONFIG_PCI_ENDPOINT=y
128+
CONFIG_PCI_ENDPOINT_CONFIGFS=y
129+
CONFIG_PCI_EPF_TEST=m
125130
CONFIG_SMP=y
126131
CONFIG_NR_CPUS=16
127132
CONFIG_HIGHPTE=y
@@ -221,6 +226,7 @@ CONFIG_ATMEL_SSC=m
221226
CONFIG_QCOM_COINCELL=m
222227
CONFIG_APDS9802ALS=y
223228
CONFIG_ISL29003=y
229+
CONFIG_PCI_ENDPOINT_TEST=m
224230
CONFIG_EEPROM_AT24=y
225231
CONFIG_BLK_DEV_SD=y
226232
CONFIG_BLK_DEV_SR=y
@@ -556,6 +562,7 @@ CONFIG_REGULATOR_VEXPRESS=y
556562
CONFIG_REGULATOR_WM8994=m
557563
CONFIG_MEDIA_SUPPORT=m
558564
CONFIG_MEDIA_CAMERA_SUPPORT=y
565+
CONFIG_MEDIA_CEC_SUPPORT=y
559566
CONFIG_MEDIA_CONTROLLER=y
560567
CONFIG_VIDEO_V4L2_SUBDEV_API=y
561568
CONFIG_MEDIA_USB_SUPPORT=y
@@ -581,6 +588,8 @@ CONFIG_VIDEO_STI_DELTA=m
581588
CONFIG_VIDEO_RENESAS_JPU=m
582589
CONFIG_VIDEO_RENESAS_VSP1=m
583590
CONFIG_V4L_TEST_DRIVERS=y
591+
CONFIG_CEC_PLATFORM_DRIVERS=y
592+
CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
584593
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
585594
CONFIG_VIDEO_ADV7180=m
586595
CONFIG_VIDEO_ML86V7667=m
@@ -612,6 +621,7 @@ CONFIG_DRM_TEGRA=y
612621
CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
613622
CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
614623
CONFIG_DRM_PANEL_SIMPLE=y
624+
CONFIG_DRM_SII9234=m
615625
CONFIG_DRM_STI=m
616626
CONFIG_DRM_VC4=y
617627
CONFIG_FB_ARMCLCD=y
@@ -650,6 +660,7 @@ CONFIG_SND_SOC_SAMSUNG=m
650660
CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
651661
CONFIG_SND_SOC_SMDK_WM8994_PCM=m
652662
CONFIG_SND_SOC_SNOW=m
663+
CONFIG_SND_SOC_ODROID=m
653664
CONFIG_SND_SOC_SH4_FSI=m
654665
CONFIG_SND_SOC_RCAR=m
655666
CONFIG_SND_SIMPLE_SCU_CARD=m
@@ -878,6 +889,7 @@ CONFIG_PWM_ATMEL=m
878889
CONFIG_PWM_ATMEL_HLCDC_PWM=m
879890
CONFIG_PWM_ATMEL_TCB=m
880891
CONFIG_PWM_FSL_FTM=m
892+
CONFIG_PWM_RCAR=m
881893
CONFIG_PWM_RENESAS_TPU=y
882894
CONFIG_PWM_ROCKCHIP=m
883895
CONFIG_PWM_SAMSUNG=m

‎arch/arm/configs/omap2plus_defconfig‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,13 @@ CONFIG_SOC_AM43XX=y
4848
CONFIG_SOC_DRA7XX=y
4949
CONFIG_ARM_THUMBEE=y
5050
CONFIG_ARM_ERRATA_411920=y
51+
CONFIG_PCI=y
52+
CONFIG_PCI_MSI=y
53+
CONFIG_PCI_DRA7XX=y
54+
CONFIG_PCI_DRA7XX_EP=y
55+
CONFIG_PCI_ENDPOINT=y
56+
CONFIG_PCI_ENDPOINT_CONFIGFS=y
57+
CONFIG_PCI_EPF_TEST=m
5158
CONFIG_SMP=y
5259
CONFIG_NR_CPUS=2
5360
CONFIG_CMA=y
@@ -137,6 +144,7 @@ CONFIG_BLK_DEV_RAM=y
137144
CONFIG_BLK_DEV_RAM_SIZE=16384
138145
CONFIG_SENSORS_TSL2550=m
139146
CONFIG_SRAM=y
147+
CONFIG_PCI_ENDPOINT_TEST=m
140148
CONFIG_EEPROM_AT24=m
141149
CONFIG_BLK_DEV_SD=y
142150
CONFIG_SCSI_SCAN_ASYNC=y
@@ -468,6 +476,7 @@ CONFIG_PWM_TIECAP=m
468476
CONFIG_PWM_TIEHRPWM=m
469477
CONFIG_PWM_TWL=m
470478
CONFIG_PWM_TWL_LED=m
479+
CONFIG_PHY_CPCAP_USB=m
471480
CONFIG_PHY_DM816X_USB=m
472481
CONFIG_OMAP_USB2=m
473482
CONFIG_TI_PIPE3=y
@@ -516,3 +525,13 @@ CONFIG_LIBCRC32C=y
516525
CONFIG_FONTS=y
517526
CONFIG_FONT_8x8=y
518527
CONFIG_FONT_8x16=y
528+
CONFIG_KERNEL_MODE_NEON=y
529+
CONFIG_ARM_CRYPTO=y
530+
CONFIG_CRYPTO_SHA1_ARM=m
531+
CONFIG_CRYPTO_SHA1_ARM_NEON=m
532+
CONFIG_CRYPTO_SHA256_ARM=m
533+
CONFIG_CRYPTO_SHA512_ARM=m
534+
CONFIG_CRYPTO_AES_ARM=m
535+
CONFIG_CRYPTO_AES_ARM_BS=m
536+
CONFIG_CRYPTO_CHACHA20_NEON=m
537+
CONFIG_CRYPTO_GHASH_ARM_CE=m

‎arch/arm/configs/qcom_defconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,9 @@ CONFIG_REGULATOR_QCOM_RPM=y
136136
CONFIG_REGULATOR_QCOM_SMD_RPM=y
137137
CONFIG_REGULATOR_QCOM_SPMI=y
138138
CONFIG_MEDIA_SUPPORT=y
139+
CONFIG_DRM=y
139140
CONFIG_FB=y
141+
CONFIG_FRAMEBUFFER_CONSOLE=y
140142
CONFIG_BACKLIGHT_LCD_SUPPORT=y
141143
# CONFIG_LCD_CLASS_DEVICE is not set
142144
CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -200,6 +202,7 @@ CONFIG_MSM_LCC_8960=y
200202
CONFIG_MDM_LCC_9615=y
201203
CONFIG_MSM_MMCC_8960=y
202204
CONFIG_MSM_MMCC_8974=y
205+
CONFIG_MSM_IOMMU=y
203206
CONFIG_HWSPINLOCK=y
204207
CONFIG_HWSPINLOCK_QCOM=y
205208
CONFIG_REMOTEPROC=y

‎arch/arm/configs/shmobile_defconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ CONFIG_SND_SOC=y
173173
CONFIG_SND_SOC_SH4_FSI=y
174174
CONFIG_SND_SOC_RCAR=y
175175
CONFIG_SND_SOC_AK4642=y
176+
CONFIG_SND_SOC_SGTL5000=y
176177
CONFIG_SND_SOC_WM8978=y
177178
CONFIG_SND_SIMPLE_SCU_CARD=y
178179
CONFIG_USB=y
@@ -207,6 +208,7 @@ CONFIG_STAGING_BOARD=y
207208
CONFIG_IIO=y
208209
CONFIG_AK8975=y
209210
CONFIG_PWM=y
211+
CONFIG_PWM_RCAR=y
210212
CONFIG_PWM_RENESAS_TPU=y
211213
CONFIG_GENERIC_PHY=y
212214
CONFIG_PHY_RCAR_GEN2=y

‎arch/arm/mach-davinci/board-da850-evm.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -798,11 +798,11 @@ static int da850_lcd_hw_init(void)
798798
{
799799
int status;
800800

801-
status = gpio_request(DA850_LCD_BL_PIN, "lcd bl\n");
801+
status = gpio_request(DA850_LCD_BL_PIN, "lcd bl");
802802
if (status < 0)
803803
return status;
804804

805-
status = gpio_request(DA850_LCD_PWR_PIN, "lcd pwr\n");
805+
status = gpio_request(DA850_LCD_PWR_PIN, "lcd pwr");
806806
if (status < 0) {
807807
gpio_free(DA850_LCD_BL_PIN);
808808
return status;

0 commit comments

Comments
 (0)