Skip to content

Commit e32697d

Browse files
committed
Merge tag 'davinci-updates-for-v6.16-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into soc/arm
TI DaVinci updates for v6.16-rc1 - remove support for the da830 SoC - increase the panel FIFO threshold in da850-evm * tag 'davinci-updates-for-v6.16-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: ARM: dts: davinci: da850-evm: Increase fifo threshold ARM: davinci: remove support for da830 Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents acda1d3 + 55da73f commit e32697d

File tree

13 files changed

+1
-956
lines changed

13 files changed

+1
-956
lines changed

arch/arm/boot/dts/ti/davinci/da850-evm.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
sync-edge = <0>;
6161
sync-ctrl = <1>;
6262
raster-order = <0>;
63-
fifo-th = <0>;
63+
fifo-th = <1>;
6464
};
6565

6666
display-timings {

arch/arm/configs/davinci_all_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
1414
CONFIG_ARCH_MULTI_V5=y
1515
# CONFIG_ARCH_MULTI_V7 is not set
1616
CONFIG_ARCH_DAVINCI=y
17-
CONFIG_ARCH_DAVINCI_DA830=y
1817
CONFIG_ARCH_DAVINCI_DA850=y
1918
CONFIG_DAVINCI_MUX_DEBUG=y
2019
CONFIG_DAVINCI_MUX_WARNINGS=y

arch/arm/configs/multi_v5_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ CONFIG_MACH_ASPEED_G4=y
1212
CONFIG_ARCH_AT91=y
1313
CONFIG_SOC_AT91SAM9=y
1414
CONFIG_ARCH_DAVINCI=y
15-
CONFIG_ARCH_DAVINCI_DA830=y
1615
CONFIG_ARCH_DAVINCI_DA850=y
1716
CONFIG_ARCH_MXC=y
1817
CONFIG_SOC_IMX25=y

arch/arm/mach-davinci/Kconfig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,6 @@ if ARCH_DAVINCI
1919

2020
comment "DaVinci Core Type"
2121

22-
config ARCH_DAVINCI_DA830
23-
bool "DA830/OMAP-L137/AM17x based system"
24-
select ARCH_DAVINCI_DA8XX
25-
# needed on silicon revs 1.0, 1.1:
26-
select CPU_DCACHE_WRITETHROUGH if !CPU_DCACHE_DISABLE
27-
select DAVINCI_CP_INTC
28-
2922
config ARCH_DAVINCI_DA850
3023
bool "DA850/OMAP-L138/AM18x based system"
3124
select ARCH_DAVINCI_DA8XX

arch/arm/mach-davinci/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ obj-y := common.o sram.o devices-da8xx.o
1010
obj-$(CONFIG_DAVINCI_MUX) += mux.o
1111

1212
# Chip specific
13-
obj-$(CONFIG_ARCH_DAVINCI_DA830) += da830.o
1413
obj-$(CONFIG_ARCH_DAVINCI_DA850) += da850.o pdata-quirks.o
1514

1615
obj-y += da8xx-dt.o

arch/arm/mach-davinci/cputype.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ struct davinci_id {
2525
};
2626

2727
/* Can use lower 16 bits of cpu id for a variant when required */
28-
#define DAVINCI_CPU_ID_DA830 0x08300000
2928
#define DAVINCI_CPU_ID_DA850 0x08500000
3029

3130
#endif

0 commit comments

Comments
 (0)