ARM: remove unused davinci board & drivers
Subsystems (19)
cover ARM: remove unused davinci board & drivers
From: Arnd Bergmann <[email protected]>
As part of removing all board files that were previously marked as unused, I looked through the davinci platform and recursively removed everything that has now become unused.
In particular, this is for all dm3xx support, in addition to the dm64xx support removed previously. The remaining support is now for da8xx using devicetree only, which means a lot of the da8xx specific device support can also go away.
As with the previous series, I can keep patches together in the soc tree, or subsystem maintainers can pick them up individually through their subsystems, whichever they prefer.
Arnd Bergmann (14):
ARM: davinci: remove unused board support
ARM: davinci: drop DAVINCI_DMxxx references
ARM: davinci: clean up platform support
clk: remove davinci dm3xx drivers
usb: musb: remove unused davinci support
mfd: remove dm355evm_msp driver
input: remove davinci keyboard driver
rtc: remove davinci rtc driver
ASoC: remove unused davinci support
mfd: remove davinci voicecodec driver
pata: remove palmchip bk3710 driver
irqchip: remove davinci aintc driver
staging: media: remove davinci vpfe_capture driver
media: davinci: remove vpbe support
.../admin-guide/media/davinci-vpbe.rst | 65 - .../admin-guide/media/platform-cardlist.rst | 1 - .../admin-guide/media/v4l-drivers.rst | 1 - .../media/drivers/davinci-vpbe-devel.rst | 39 - .../driver-api/media/drivers/index.rst | 1 - MAINTAINERS | 1 - arch/arm/Kconfig.debug | 16 +- arch/arm/mach-davinci/Kconfig | 142 -- arch/arm/mach-davinci/Makefile | 18 +- arch/arm/mach-davinci/board-da830-evm.c | 690 ------ arch/arm/mach-davinci/board-da850-evm.c | 1550 -------------- arch/arm/mach-davinci/board-dm355-evm.c | 444 ---- arch/arm/mach-davinci/board-dm355-leopard.c | 278 --- arch/arm/mach-davinci/board-dm365-evm.c | 855 -------- arch/arm/mach-davinci/board-mityomapl138.c | 638 ------ arch/arm/mach-davinci/board-omapl138-hawk.c | 451 ---- arch/arm/mach-davinci/common.h | 7 +- arch/arm/mach-davinci/cputype.h | 53 - arch/arm/mach-davinci/da830.c | 274 --- arch/arm/mach-davinci/da850.c | 400 +--- arch/arm/mach-davinci/da8xx.h | 95 +- arch/arm/mach-davinci/davinci.h | 136 -- arch/arm/mach-davinci/devices-da8xx.c | 1094 ---------- arch/arm/mach-davinci/devices.c | 303 --- arch/arm/mach-davinci/dm355.c | 832 ------- arch/arm/mach-davinci/dm365.c | 1094 ---------- arch/arm/mach-davinci/mux.c | 15 - arch/arm/mach-davinci/serial.c | 92 - arch/arm/mach-davinci/serial.h | 15 - arch/arm/mach-davinci/usb-da8xx.c | 146 -- arch/arm/mach-davinci/usb.c | 87 - drivers/ata/Kconfig | 10 - drivers/ata/Makefile | 1 - drivers/ata/pata_bk3710.c | 380 ---- drivers/clk/davinci/Makefile | 4 - drivers/clk/davinci/pll-dm355.c | 77 - drivers/clk/davinci/pll-dm365.c | 146 -- drivers/clk/davinci/pll.c | 8 - drivers/clk/davinci/pll.h | 5 - drivers/clk/davinci/psc-dm355.c | 89 - drivers/clk/davinci/psc-dm365.c | 111 - drivers/clk/davinci/psc.c | 6 - drivers/clk/davinci/psc.h | 7 - drivers/input/keyboard/Kconfig | 10 - drivers/input/keyboard/Makefile | 1 - drivers/input/keyboard/davinci_keyscan.c | 315 --- drivers/input/misc/Kconfig | 11 - drivers/input/misc/Makefile | 1 - drivers/input/misc/dm355evm_keys.c | 238 --- drivers/irqchip/Kconfig | 5 - drivers/irqchip/Makefile | 1 - drivers/irqchip/irq-davinci-aintc.c | 163 -- drivers/media/platform/ti/davinci/Kconfig | 16 - drivers/media/platform/ti/davinci/Makefile | 3 - drivers/media/platform/ti/davinci/vpbe.c | 840 -------- .../media/platform/ti/davinci/vpbe_display.c | 1510 ------------- drivers/media/platform/ti/davinci/vpbe_osd.c | 1582 -------------- .../media/platform/ti/davinci/vpbe_osd_regs.h | 352 --- drivers/media/platform/ti/davinci/vpbe_venc.c | 676 ------ .../platform/ti/davinci/vpbe_venc_regs.h | 165 -- drivers/media/platform/ti/davinci/vpss.c | 529 ----- drivers/mfd/Kconfig | 13 - drivers/mfd/Makefile | 3 - drivers/mfd/davinci_voicecodec.c | 136 -- drivers/mfd/dm355evm_msp.c | 454 ---- drivers/rtc/Kconfig | 16 - drivers/rtc/Makefile | 2 - drivers/rtc/rtc-davinci.c | 512 ----- drivers/rtc/rtc-dm355evm.c | 151 -- drivers/staging/media/Kconfig | 1 - drivers/staging/media/Makefile | 1 - .../media/deprecated/vpfe_capture/Kconfig | 58 - .../media/deprecated/vpfe_capture/Makefile | 4 - .../media/deprecated/vpfe_capture/TODO | 7 - .../deprecated/vpfe_capture/ccdc_hw_device.h | 80 - .../deprecated/vpfe_capture/dm355_ccdc.c | 934 -------- .../deprecated/vpfe_capture/dm355_ccdc.h | 308 --- .../deprecated/vpfe_capture/dm355_ccdc_regs.h | 297 --- .../deprecated/vpfe_capture/dm644x_ccdc.c | 879 -------- .../deprecated/vpfe_capture/dm644x_ccdc.h | 171 -- .../vpfe_capture/dm644x_ccdc_regs.h | 140 -- .../media/deprecated/vpfe_capture/isif.c | 1127 ---------- .../media/deprecated/vpfe_capture/isif.h | 518 ----- .../media/deprecated/vpfe_capture/isif_regs.h | 256 --- .../deprecated/vpfe_capture/vpfe_capture.c | 1902 ----------------- drivers/usb/musb/Kconfig | 12 - drivers/usb/musb/Makefile | 2 - drivers/usb/musb/cppi_dma.c | 1547 -------------- drivers/usb/musb/davinci.c | 606 ------ drivers/usb/musb/davinci.h | 103 - include/linux/clk/davinci.h | 9 - include/linux/mfd/dm355evm_msp.h | 79 - include/media/davinci/vpbe.h | 184 -- include/media/davinci/vpbe_display.h | 122 -- include/media/davinci/vpbe_osd.h | 382 ---- include/media/davinci/vpbe_types.h | 74 - include/media/davinci/vpbe_venc.h | 37 - include/media/davinci/vpfe_capture.h | 177 -- include/media/davinci/vpss.h | 111 - sound/soc/ti/Kconfig | 40 - sound/soc/ti/Makefile | 2 - sound/soc/ti/davinci-evm.c | 267 +-- sound/soc/ti/davinci-vcif.c | 247 --- 103 files changed, 17 insertions(+), 29049 deletions(-) delete mode 100644 Documentation/admin-guide/media/davinci-vpbe.rst delete mode 100644 Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst delete mode 100644 arch/arm/mach-davinci/board-da830-evm.c delete mode 100644 arch/arm/mach-davinci/board-da850-evm.c delete mode 100644 arch/arm/mach-davinci/board-dm355-evm.c delete mode 100644 arch/arm/mach-davinci/board-dm355-leopard.c delete mode 100644 arch/arm/mach-davinci/board-dm365-evm.c delete mode 100644 arch/arm/mach-davinci/board-mityomapl138.c delete mode 100644 arch/arm/mach-davinci/board-omapl138-hawk.c delete mode 100644 arch/arm/mach-davinci/davinci.h delete mode 100644 arch/arm/mach-davinci/devices.c delete mode 100644 arch/arm/mach-davinci/dm355.c delete mode 100644 arch/arm/mach-davinci/dm365.c delete mode 100644 arch/arm/mach-davinci/serial.c delete mode 100644 arch/arm/mach-davinci/usb-da8xx.c delete mode 100644 arch/arm/mach-davinci/usb.c delete mode 100644 drivers/ata/pata_bk3710.c delete mode 100644 drivers/clk/davinci/pll-dm355.c delete mode 100644 drivers/clk/davinci/pll-dm365.c delete mode 100644 drivers/clk/davinci/psc-dm355.c delete mode 100644 drivers/clk/davinci/psc-dm365.c delete mode 100644 drivers/input/keyboard/davinci_keyscan.c delete mode 100644 drivers/input/misc/dm355evm_keys.c delete mode 100644 drivers/irqchip/irq-davinci-aintc.c delete mode 100644 drivers/media/platform/ti/davinci/vpbe.c delete mode 100644 drivers/media/platform/ti/davinci/vpbe_display.c delete mode 100644 drivers/media/platform/ti/davinci/vpbe_osd.c delete mode 100644 drivers/media/platform/ti/davinci/vpbe_osd_regs.h delete mode 100644 drivers/media/platform/ti/davinci/vpbe_venc.c delete mode 100644 drivers/media/platform/ti/davinci/vpbe_venc_regs.h delete mode 100644 drivers/media/platform/ti/davinci/vpss.c delete mode 100644 drivers/mfd/davinci_voicecodec.c delete mode 100644 drivers/mfd/dm355evm_msp.c delete mode 100644 drivers/rtc/rtc-davinci.c delete mode 100644 drivers/rtc/rtc-dm355evm.c delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/Kconfig delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/Makefile delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/TODO delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/ccdc_hw_device.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc.c delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc_regs.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc.c delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc_regs.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/isif.c delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/isif.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/isif_regs.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/vpfe_capture.c delete mode 100644 drivers/usb/musb/cppi_dma.c delete mode 100644 drivers/usb/musb/davinci.c delete mode 100644 drivers/usb/musb/davinci.h delete mode 100644 include/linux/mfd/dm355evm_msp.h delete mode 100644 include/media/davinci/vpbe.h delete mode 100644 include/media/davinci/vpbe_display.h delete mode 100644 include/media/davinci/vpbe_osd.h delete mode 100644 include/media/davinci/vpbe_types.h delete mode 100644 include/media/davinci/vpbe_venc.h delete mode 100644 include/media/davinci/vpfe_capture.h delete mode 100644 include/media/davinci/vpss.h delete mode 100644 sound/soc/ti/davinci-vcif.c
Signature · 1 line
2.29.2
PATCH 1/14 ARM: davinci: remove unused board support
From: Arnd Bergmann <[email protected]>
All Kconfig entries marked as "depends on UNUSED_BOARD_FILES" and their direct dependencies are removed here as planned.
--- arch/arm/Kconfig.debug | 16 +- arch/arm/mach-davinci/Kconfig | 130 +- arch/arm/mach-davinci/Makefile | 9 - arch/arm/mach-davinci/board-da830-evm.c | 690 --------- arch/arm/mach-davinci/board-da850-evm.c | 1550 ------------------- arch/arm/mach-davinci/board-dm355-evm.c | 444 ------ arch/arm/mach-davinci/board-dm355-leopard.c | 278 ---- arch/arm/mach-davinci/board-dm365-evm.c | 855 ---------- arch/arm/mach-davinci/board-mityomapl138.c | 638 -------- arch/arm/mach-davinci/board-omapl138-hawk.c | 451 ------ arch/arm/mach-davinci/devices.c | 303 ---- arch/arm/mach-davinci/dm355.c | 832 ---------- arch/arm/mach-davinci/dm365.c | 1094 ------------- 13 files changed, 5 insertions(+), 7285 deletions(-) delete mode 100644 arch/arm/mach-davinci/board-da830-evm.c delete mode 100644 arch/arm/mach-davinci/board-da850-evm.c delete mode 100644 arch/arm/mach-davinci/board-dm355-evm.c delete mode 100644 arch/arm/mach-davinci/board-dm355-leopard.c delete mode 100644 arch/arm/mach-davinci/board-dm365-evm.c delete mode 100644 arch/arm/mach-davinci/board-mityomapl138.c delete mode 100644 arch/arm/mach-davinci/board-omapl138-hawk.c delete mode 100644 arch/arm/mach-davinci/devices.c delete mode 100644 arch/arm/mach-davinci/dm355.c delete mode 100644 arch/arm/mach-davinci/dm365.c
arch/arm/Kconfig.debug +3 -13
@@ -323,14 +323,6 @@ choice Say Y here if you want the debug print routines to direct their output to UART2 serial port on DaVinci DA8XX devices. - config DEBUG_DAVINCI_DMx_UART0 - bool "Kernel low-level debugging on DaVinci DMx using UART0" - depends on ARCH_DAVINCI_DMx - select DEBUG_UART_8250 - help - Say Y here if you want the debug print routines to direct - their output to UART0 serial port on DaVinci DMx devices. - config DEBUG_DC21285_PORT bool "Kernel low-level debugging messages via footbridge serial port" depends on FOOTBRIDGE
@@ -1590,7 +1582,6 @@ config DEBUG_UART_8250 config DEBUG_UART_PHYS hex "Physical base address of debug UART" - default 0x01c20000 if DEBUG_DAVINCI_DMx_UART0 default 0x01c28000 if DEBUG_SUNXI_UART0 default 0x01c28400 if DEBUG_SUNXI_UART1 default 0x01d0c000 if DEBUG_DAVINCI_DA8XX_UART1
@@ -1810,7 +1801,6 @@ config DEBUG_UART_VIRT default 0xfec03000 if DEBUG_SOCFPGA_CYCLONE5_UART1 default 0xfec12000 if DEBUG_MVEBU_UART0 || DEBUG_MVEBU_UART0_ALTERNATE default 0xfec12100 if DEBUG_MVEBU_UART1_ALTERNATE - default 0xfec20000 if DEBUG_DAVINCI_DMx_UART0 default 0xfec90000 if DEBUG_RK32_UART2 default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1 default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2 || DEBUG_SD5203_UART
@@ -1854,9 +1844,9 @@ config DEBUG_UART_8250_WORD default y if DEBUG_SOCFPGA_UART0 || DEBUG_SOCFPGA_ARRIA10_UART1 || \ DEBUG_SOCFPGA_CYCLONE5_UART1 || DEBUG_KEYSTONE_UART0 || \ DEBUG_KEYSTONE_UART1 || DEBUG_ALPINE_UART0 || \ - DEBUG_DAVINCI_DMx_UART0 || DEBUG_DAVINCI_DA8XX_UART1 || \ - DEBUG_DAVINCI_DA8XX_UART2 || DEBUG_BCM_IPROC_UART3 || \ - DEBUG_BCM_KONA_UART || DEBUG_RK32_UART2 + DEBUG_DAVINCI_DA8XX_UART1 || DEBUG_DAVINCI_DA8XX_UART2 || \ + DEBUG_BCM_IPROC_UART3 || DEBUG_BCM_KONA_UART || \ + DEBUG_RK32_UART2 config DEBUG_UART_8250_PALMCHIP bool "8250 UART is Palmchip BK-310x"
arch/arm/mach-davinci/Kconfig +2 -128
158 lines not on this page · raw message
arch/arm/mach-davinci/Makefile +0 -9
@@ -10,20 +10,11 @@ obj-y := serial.o usb.o common.o sram.o obj-$(CONFIG_DAVINCI_MUX) += mux.o # Chip specific -obj-$(CONFIG_ARCH_DAVINCI_DM355) += dm355.o devices.o -obj-$(CONFIG_ARCH_DAVINCI_DM365) += dm365.o devices.o obj-$(CONFIG_ARCH_DAVINCI_DA830) += da830.o devices-da8xx.o usb-da8xx.o obj-$(CONFIG_ARCH_DAVINCI_DA850) += da850.o devices-da8xx.o usb-da8xx.o # Board specific obj-$(CONFIG_MACH_DA8XX_DT) += da8xx-dt.o pdata-quirks.o -obj-$(CONFIG_MACH_DAVINCI_DM355_EVM) += board-dm355-evm.o -obj-$(CONFIG_MACH_DM355_LEOPARD) += board-dm355-leopard.o -obj-$(CONFIG_MACH_DAVINCI_DM365_EVM) += board-dm365-evm.o -obj-$(CONFIG_MACH_DAVINCI_DA830_EVM) += board-da830-evm.o -obj-$(CONFIG_MACH_DAVINCI_DA850_EVM) += board-da850-evm.o -obj-$(CONFIG_MACH_MITYOMAPL138) += board-mityomapl138.o -obj-$(CONFIG_MACH_OMAPL138_HAWKBOARD) += board-omapl138-hawk.o # Power Management obj-$(CONFIG_CPU_IDLE) += cpuidle.o
arch/arm/mach-davinci/board-da830-evm.c deleted +0 -690
690 lines not on this page · raw message
arch/arm/mach-davinci/board-da850-evm.c deleted +0 -1550
1,550 lines not on this page · raw message
arch/arm/mach-davinci/board-dm355-evm.c deleted +0 -444
444 lines not on this page · raw message
arch/arm/mach-davinci/board-dm355-leopard.c deleted +0 -278
98 lines not on this page · raw message
arch/arm/mach-davinci/board-dm365-evm.c deleted +0 -855
855 lines not on this page · raw message
arch/arm/mach-davinci/board-mityomapl138.c deleted +0 -638
638 lines not on this page · raw message
arch/arm/mach-davinci/board-omapl138-hawk.c deleted +0 -451
451 lines not on this page · raw message
arch/arm/mach-davinci/devices.c deleted +0 -303
303 lines not on this page · raw message
arch/arm/mach-davinci/dm355.c deleted +0 -832
832 lines not on this page · raw message
arch/arm/mach-davinci/dm365.c deleted +0 -1094
1,094 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.29.2
Part of the diff is not shown here. View the raw message.
Re: [PATCH 01/14] ARM: davinci: remove unused board support
Quoted 8 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
All
Kconfigentries marked as "depends onUNUSED_BOARD_FILES" and their direct dependencies are removed here as planned.Signed-off-by Arnd Bergmann <[email protected]>---
PATCH 2/14 ARM: davinci: drop DAVINCI_DMxxx references
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
Support for all the dm3xx/dm64xx SoCs is no longer available, so drop all other references to those.
--- arch/arm/mach-davinci/cputype.h | 32 -------------------------------- arch/arm/mach-davinci/serial.c | 4 ---- arch/arm/mach-davinci/usb.c | 13 ------------- drivers/clk/davinci/pll.c | 8 -------- drivers/clk/davinci/pll.h | 5 ----- drivers/clk/davinci/psc.c | 6 ------ drivers/clk/davinci/psc.h | 7 ------- include/linux/clk/davinci.h | 9 --------- 8 files changed, 84 deletions(-)
arch/arm/mach-davinci/cputype.h +0 -32
@@ -25,10 +25,6 @@ struct davinci_id { };/* Can use lower 16 bits of cpu id for a variant when required */ -#define DAVINCI_CPU_ID_DM6446 0x64460000 -#define DAVINCI_CPU_ID_DM6467 0x64670000 -#define DAVINCI_CPU_ID_DM355 0x03550000 -#define DAVINCI_CPU_ID_DM365 0x03650000#define DAVINCI_CPU_ID_DA830 0x08300000#define DAVINCI_CPU_ID_DA850 0x08500000
@@ -38,37 +34,9 @@ static inline int is_davinci_ ##type(void) \return (davinci_soc_info.cpu_id == (id)); \ } -IS_DAVINCI_CPU(dm644x, DAVINCI_CPU_ID_DM6446) -IS_DAVINCI_CPU(dm646x, DAVINCI_CPU_ID_DM6467) -IS_DAVINCI_CPU(dm355, DAVINCI_CPU_ID_DM355) -IS_DAVINCI_CPU(dm365, DAVINCI_CPU_ID_DM365) IS_DAVINCI_CPU(da830, DAVINCI_CPU_ID_DA830) IS_DAVINCI_CPU(da850, DAVINCI_CPU_ID_DA850) -#ifdef CONFIG_ARCH_DAVINCI_DM644x -#define cpu_is_davinci_dm644x () is_davinci_dm644x() -#else -#define cpu_is_davinci_dm644x () 0 -#endif - -#ifdef CONFIG_ARCH_DAVINCI_DM646x -#define cpu_is_davinci_dm646x () is_davinci_dm646x() -#else -#define cpu_is_davinci_dm646x () 0 -#endif - -#ifdef CONFIG_ARCH_DAVINCI_DM355 -#define cpu_is_davinci_dm355 () is_davinci_dm355() -#else -#define cpu_is_davinci_dm355 () 0 -#endif - -#ifdef CONFIG_ARCH_DAVINCI_DM365 -#define cpu_is_davinci_dm365 () is_davinci_dm365() -#else -#define cpu_is_davinci_dm365 () 0 -#endif -#ifdef CONFIG_ARCH_DAVINCI_DA830 #define cpu_is_davinci_da830 () is_davinci_da830()#else
arch/arm/mach-davinci/serial.c +0 -4
@@ -40,10 +40,6 @@ static void __init davinci_serial_reset(struct plat_serial8250_port *p) pwremu |= (0x3 <<13 ); pwremu |=0x1 ;serial_write_reg (p,UART_DAVINCI_PWREMU , pwremu); - -if (cpu_is_davinci_dm646x ()) -serial_write_reg (p,UART_DM646X_SCR , -UART_DM646X_SCR_TX_WATERMARK ); }int __init davinci_serial_init (struct platform_device *serial_dev)
arch/arm/mach-davinci/usb.c +0 -13
@@ -41,11 +41,6 @@ static struct resource usb_resources[] = { .flags = IORESOURCE_IRQ, .name ="mc" }, - { -/* placeholder for the dedicated CPPI IRQ */ - .flags = IORESOURCE_IRQ, - .name = "dma" - }, };static u64 usb_dmamask =DMA_BIT_MASK (32 );
@@ -67,14 +62,6 @@ void __init davinci_setup_usb(unsigned mA, unsigned potpgt_ms) usb_data.power = mA >510 ?255 : mA /2 ; usb_data.potpgt = (potpgt_ms +1 ) /2 ; -if (cpu_is_davinci_dm646x ()) { -/* Override the defaults as DM6467 uses different IRQs. */ - usb_dev.resource[1 ].start =DAVINCI_INTC_IRQ (IRQ_DM646X_USBINT ); - usb_dev.resource[2 ].start =DAVINCI_INTC_IRQ ( -IRQ_DM646X_USBDMAINT ); - }else /* other devices don't have dedicated CPPI IRQ */ - usb_dev.num_resources =2 ; -platform_device_register (&usb_dev); }
drivers/clk/davinci/pll.c +0 -8
@@ -881,14 +881,6 @@ static const struct platform_device_id davinci_pll_id_table[] = {#ifdef CONFIG_ARCH_DAVINCI_DA850 { .name = "da850-pll0", .driver_data = (kernel_ulong_t)da850_pll0_init }, { .name = "da850-pll1", .driver_data = (kernel_ulong_t)da850_pll1_init }, -#endif -#ifdef CONFIG_ARCH_DAVINCI_DM355 - { .name = "dm355-pll1", .driver_data = (kernel_ulong_t)dm355_pll1_init }, - { .name = "dm355-pll2", .driver_data = (kernel_ulong_t)dm355_pll2_init }, -#endif -#ifdef CONFIG_ARCH_DAVINCI_DM365 - { .name = "dm365-pll1", .driver_data = (kernel_ulong_t)dm365_pll1_init }, - { .name = "dm365-pll2", .driver_data = (kernel_ulong_t)dm365_pll2_init },#endif { } };
drivers/clk/davinci/pll.h +0 -5
@@ -122,13 +122,8 @@ int of_davinci_pll_init(struct device *dev, struct device_node *node,/* Platform-specific callbacks */ -#ifdef CONFIG_ARCH_DAVINCI_DA850 int da850_pll1_init (struct device *dev,void __iomem *base,struct regmap *cfgchip);void of_da850_pll0_init (struct device_node *node);int of_da850_pll1_init (struct device *dev,void __iomem *base,struct regmap *cfgchip); -#endif -#ifdef CONFIG_ARCH_DAVINCI_DM355 -int dm355_pll2_init (struct device *dev,void __iomem *base,struct regmap *cfgchip); -#endif #endif /* __CLK_DAVINCI_PLL_H___ */
drivers/clk/davinci/psc.c +0 -6
@@ -510,12 +510,6 @@ static const struct platform_device_id davinci_psc_id_table[] = {#ifdef CONFIG_ARCH_DAVINCI_DA850 { .name = "da850-psc0", .driver_data = (kernel_ulong_t)&da850_psc0_init_data }, { .name = "da850-psc1", .driver_data = (kernel_ulong_t)&da850_psc1_init_data }, -#endif -#ifdef CONFIG_ARCH_DAVINCI_DM355 - { .name = "dm355-psc", .driver_data = (kernel_ulong_t)&dm355_psc_init_data }, -#endif -#ifdef CONFIG_ARCH_DAVINCI_DM365 - { .name = "dm365-psc", .driver_data = (kernel_ulong_t)&dm365_psc_init_data },#endif { } };
drivers/clk/davinci/psc.h +0 -7
@@ -104,11 +104,4 @@ extern const struct davinci_psc_init_data da850_psc1_init_data;extern const struct davinci_psc_init_data of_da850_psc0_init_data;extern const struct davinci_psc_init_data of_da850_psc1_init_data;#endif -#ifdef CONFIG_ARCH_DAVINCI_DM355 -extern const struct davinci_psc_init_data dm355_psc_init_data; -#endif -#ifdef CONFIG_ARCH_DAVINCI_DM365 -extern const struct davinci_psc_init_data dm365_psc_init_data; -#endif -#endif /* __CLK_DAVINCI_PSC_H__ */
include/linux/clk/davinci.h +0 -9
@@ -19,14 +19,5 @@ int da830_pll_init(struct device *dev, void __iomem *base, struct regmap *cfgchi#ifdef CONFIG_ARCH_DAVINCI_DA850 int da850_pll0_init (struct device *dev,void __iomem *base,struct regmap *cfgchip);#endif -#ifdef CONFIG_ARCH_DAVINCI_DM355 -int dm355_pll1_init (struct device *dev,void __iomem *base,struct regmap *cfgchip); -int dm355_psc_init (struct device *dev,void __iomem *base); -#endif -#ifdef CONFIG_ARCH_DAVINCI_DM365 -int dm365_pll1_init (struct device *dev,void __iomem *base,struct regmap *cfgchip); -int dm365_pll2_init (struct device *dev,void __iomem *base,struct regmap *cfgchip); -int dm365_psc_init (struct device *dev,void __iomem *base); -#endif #endif /* __LINUX_CLK_DAVINCI_PLL_H___ */
Signature · 1 line
2.29.2
David Lechner
maintainerRe: [PATCH 02/14] ARM: davinci: drop DAVINCI_DMxxx references
Quoted 30 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Support for all the dm3xx/dm64xx SoCs is no longer available, so drop all other references to those.
Signed-off-by Arnd Bergmann <[email protected]>---
int
__initdavinci_serial_init(struct platform_device *serial_dev)arch/arm/mach-davinci/usb.c +0
-6@@ -41,11 +41,6 @@ static struct resource usb_resources[] = { .flags = IORESOURCE_IRQ, .name ="mc" }, - { -/* placeholder for the dedicated CPPI IRQ */ - .flags = IORESOURCE_IRQ, - .name = "dma" - }, };static u64 usb_dmamask =DMA_BIT_MASK (32 );@@ -67,14 +62,6 @@ void __init davinci_setup_usb(unsigned mA, unsigned potpgt_ms) usb_data.power = mA >510 ?255 : mA /2 ; usb_data.potpgt = (potpgt_ms +1 ) /2 ; -if (cpu_is_davinci_dm646x ()) {
arch/arm/mach-davinci/usb.c void __init davinci_setup_usb(unsigned mA, unsigned potpgt_ms) · line 67
Quoted 10 lines
arch/arm/mach-davinci/usb.c +0
-7-/* Override the defaults as DM6467 uses different IRQs. */ - usb_dev.resource[1 ].start =DAVINCI_INTC_IRQ (IRQ_DM646X_USBINT ); - usb_dev.resource[2 ].start =DAVINCI_INTC_IRQ ( -IRQ_DM646X_USBDMAINT ); - }else /* other devices don't have dedicated CPPI IRQ */ - usb_dev.num_resources =2 ; -platform_device_register (&usb_dev); }
Shouldn't the else case be kept since it applies to *all* "other devices"? (and therfore the usb_resources shouldn't be modified either?)
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 02/14] ARM: davinci: drop DAVINCI_DMxxx references
Quoted 6 lines · David Lechner
Quoted 5 lines · Arnd Bergmann
static u64 usb_dmamask = DMA_BIT_MASK(32);arch/arm/mach-davinci/usb.c +0
-0@@ -67,14 +62,6 @@ void __init davinci_setup_usb(unsigned mA, unsigned potpgt_ms) usb_data.power = mA >510 ?255 : mA /2 ; usb_data.potpgt = (potpgt_ms +1 ) /2 ;
Quoted 14 lines
arch/arm/mach-davinci/usb.c void __init davinci_setup_usb(unsigned mA, unsigned potpgt_ms) · line 67
Quoted 11 lines
arch/arm/mach-davinci/usb.c +0
-8-if (cpu_is_davinci_dm646x ()) { -/* Override the defaults as DM6467 uses different IRQs. */ - usb_dev.resource[1 ].start =DAVINCI_INTC_IRQ (IRQ_DM646X_USBINT ); - usb_dev.resource[2 ].start =DAVINCI_INTC_IRQ ( -IRQ_DM646X_USBDMAINT ); - }else /* other devices don't have dedicated CPPI IRQ */ - usb_dev.num_resources =2 ; -platform_device_register (&usb_dev); }Shouldn't the else case be kept since it applies to *all* "other devices"? (and therfore the
usb_resourcesshouldn't be modified either?)
.num_resources is already initialized to 2 from ARRAY_SIZE(), so it does not have to be changed afterwards.
Arnd
Re: [PATCH 02/14] ARM: davinci: drop DAVINCI_DMxxx references
In reply to Arnd BergmannQuoting Arnd Bergmann (2022-10-19 08:29:28)
Quoted 7 lines
From: Arnd Bergmann <[email protected]>
Support for all the dm3xx/dm64xx SoCs is no longer available, so drop all other references to those.
Signed-off-by Arnd Bergmann <[email protected]>---
Quoted 17 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
As part of removing all board files that were previously marked as unused, I looked through the davinci platform and recursively removed everything that has now become unused.
In particular, this is for all dm3xx support, in addition to the dm64xx support removed previously. The remaining support is now for da8xx using devicetree only, which means a lot of the da8xx specific device support can also go away.
As with the previous series, I can keep patches together in the soc tree, or subsystem maintainers can pick them up individually through their subsystems, whichever they prefer.
Arnd Bergmann (14):
[...]
Quoted 1 line
irqchip: remove davinci aintc driver
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
PATCH 3/14 ARM: davinci: clean up platform support
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
With the board file support gone, and the platform using DT only, a lot of the remaining code is no longer referenced and can be removed.
Technically, the DT file only references DA850, but since that is very similar to DA830, I'm leaving the latter.
--- arch/arm/mach-davinci/Kconfig | 16 - arch/arm/mach-davinci/Makefile | 9 +- arch/arm/mach-davinci/asp.h | 57 -- arch/arm/mach-davinci/common.h | 7 +- arch/arm/mach-davinci/cputype.h | 21 - arch/arm/mach-davinci/da830.c | 274 ------- arch/arm/mach-davinci/da850.c | 400 +-------- arch/arm/mach-davinci/da8xx.h | 95 +-- arch/arm/mach-davinci/davinci.h | 136 --- arch/arm/mach-davinci/devices-da8xx.c | 1095 ------------------------- arch/arm/mach-davinci/irqs.h | 217 ----- arch/arm/mach-davinci/mux.c | 15 - arch/arm/mach-davinci/mux.h | 315 ------- arch/arm/mach-davinci/psc.h | 64 -- arch/arm/mach-davinci/serial.c | 88 -- arch/arm/mach-davinci/serial.h | 35 - arch/arm/mach-davinci/usb-da8xx.c | 146 ---- arch/arm/mach-davinci/usb.c | 74 -- 18 files changed, 11 insertions(+), 3053 deletions(-) delete mode 100644 arch/arm/mach-davinci/asp.h delete mode 100644 arch/arm/mach-davinci/davinci.h delete mode 100644 arch/arm/mach-davinci/serial.c delete mode 100644 arch/arm/mach-davinci/serial.h delete mode 100644 arch/arm/mach-davinci/usb-da8xx.c delete mode 100644 arch/arm/mach-davinci/usb.c
arch/arm/mach-davinci/Kconfig +0 -16
@@ -18,8 +18,6 @@ comment "DaVinci Core Type" config ARCH_DAVINCI_DA830 bool "DA830/OMAP-L137/AM17x based system" - depends on AUTO_ZRELADDR && ARM_PATCH_PHYS_VIRT - depends on ATAGS select ARCH_DAVINCI_DA8XX # needed on silicon revs 1.0, 1.1: select CPU_DCACHE_WRITETHROUGH if !CPU_DCACHE_DISABLE
@@ -27,25 +25,11 @@ config ARCH_DAVINCI_DA830 config ARCH_DAVINCI_DA850 bool "DA850/OMAP-L138/AM18x based system" - depends on AUTO_ZRELADDR && ARM_PATCH_PHYS_VIRT - depends on ATAGS - select ARCH_DAVINCI_DA8XX select DAVINCI_CP_INTC config ARCH_DAVINCI_DA8XX bool -comment "DaVinci Board Type" - -config MACH_DA8XX_DT - bool "Support DA8XX platforms using device tree" - default y - depends on ARCH_DAVINCI_DA850 - select PINCTRL - help - Say y here to include support for TI DaVinci DA850 based using - Flattened Device Tree. More information at Documentation/devicetree - config DAVINCI_MUX bool "DAVINCI multiplexing support" depends on ARCH_DAVINCI
arch/arm/mach-davinci/Makefile +4 -5
@@ -5,16 +5,15 @@ # # # Common objects -obj-y := serial.o usb.o common.o sram.o +obj-y := common.o sram.o devices-da8xx.o obj-$(CONFIG_DAVINCI_MUX) += mux.o # Chip specific -obj-$(CONFIG_ARCH_DAVINCI_DA830) += da830.o devices-da8xx.o usb-da8xx.o -obj-$(CONFIG_ARCH_DAVINCI_DA850) += da850.o devices-da8xx.o usb-da8xx.o +obj-$(CONFIG_ARCH_DAVINCI_DA830) += da830.o +obj-$(CONFIG_ARCH_DAVINCI_DA850) += da850.o -# Board specific -obj-$(CONFIG_MACH_DA8XX_DT) += da8xx-dt.o pdata-quirks.o +obj-y += da8xx-dt.o pdata-quirks.o # Power Management obj-$(CONFIG_CPU_IDLE) += cpuidle.o
arch/arm/mach-davinci/asp.h deleted +0 -57
57 lines not on this page · raw message
arch/arm/mach-davinci/common.h +2 -5
@@ -17,8 +17,8 @@#include <asm/irq.h> -#define DAVINCI_INTC_START NR_IRQS -#define DAVINCI_INTC_IRQ (_irqnum) (DAVINCI_INTC_START + (_irqnum)) +#define DAVINCI_INTC_START NR_IRQS +#define DAVINCI_INTC_IRQ (_irqnum) (DAVINCI_INTC_START + (_irqnum))struct davinci_gpio_controller ;
@@ -45,9 +45,6 @@ struct davinci_soc_info {unsigned gpio_num;unsigned gpio_irq;unsigned gpio_unbanked; -struct davinci_gpio_controller *gpio_ctlrs; -int gpio_ctlrs_num; -struct emac_platform_data *emac_pdata;dma_addr_t sram_dma;unsigned sram_len; };
arch/arm/mach-davinci/cputype.h +0 -21
@@ -28,25 +28,4 @@ struct davinci_id {#define DAVINCI_CPU_ID_DA830 0x08300000#define DAVINCI_CPU_ID_DA850 0x08500000 -#define IS_DAVINCI_CPU (type, id) \ -static inline int is_davinci_ ##type(void) \ -{ \ - return (davinci_soc_info.cpu_id == (id)); \ -} - -IS_DAVINCI_CPU(da830, DAVINCI_CPU_ID_DA830) -IS_DAVINCI_CPU(da850, DAVINCI_CPU_ID_DA850) - -#ifdef CONFIG_ARCH_DAVINCI_DA830 -#define cpu_is_davinci_da830 () is_davinci_da830() -#else -#define cpu_is_davinci_da830 () 0 -#endif - -#ifdef CONFIG_ARCH_DAVINCI_DA850 -#define cpu_is_davinci_da850 () is_davinci_da850() -#else -#define cpu_is_davinci_da850 () 0 -#endif -#endif
arch/arm/mach-davinci/da830.c +0 -274
301 lines not on this page · raw message
arch/arm/mach-davinci/da850.c +1 -399
452 lines not on this page · raw message
arch/arm/mach-davinci/da8xx.h +4 -91
125 lines not on this page · raw message
arch/arm/mach-davinci/davinci.h deleted +0 -136
136 lines not on this page · raw message
arch/arm/mach-davinci/devices-da8xx.c +0 -1095
1,110 lines not on this page · raw message
arch/arm/mach-davinci/irqs.h +0 -217
227 lines not on this page · raw message
arch/arm/mach-davinci/mux.c +0 -15
@@ -97,18 +97,3 @@ int davinci_cfg_reg(const unsigned long index)return 0 ; } -EXPORT_SYMBOL (davinci_cfg_reg); - -int davinci_cfg_reg_list (const short pins[]) -{ -int i, error = -EINVAL ; - -if (pins) -for (i =0 ; pins[i] >=0 ; i++) { - error =davinci_cfg_reg (pins[i]); -if (error) -break ; - } - -return error; -}
arch/arm/mach-davinci/mux.h +0 -315
321 lines not on this page · raw message
arch/arm/mach-davinci/psc.h +0 -64
70 lines not on this page · raw message
arch/arm/mach-davinci/serial.c deleted +0 -88
86 lines not on this page · raw message
arch/arm/mach-davinci/serial.h deleted +0 -35
Lines of this file are not shown. View the raw message.
arch/arm/mach-davinci/usb-da8xx.c deleted +0 -146
146 lines not on this page · raw message
arch/arm/mach-davinci/usb.c deleted +0 -74
74 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.29.2
Part of the diff is not shown here. View the raw message.
Re: [PATCH 03/14] ARM: davinci: clean up platform support
Quoted 7 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
With the board file support gone, and the platform using DT only, a lot of the remaining code is no longer referenced and can be removed.
Quoted 5 lines
Technically, the DT file only references DA850, but since that is very similar to DA830, I'm leaving the latter.
Signed-off-by Arnd Bergmann <[email protected]>---
PATCH 4/14 clk: remove davinci dm3xx drivers
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The davinci dm3xx machines are all removed, so the clk driver is no longer needed. The da8xx platforms are now using DT exclusively, so those drivers remain untouched.
--- drivers/clk/davinci/Makefile | 4 - drivers/clk/davinci/pll-dm355.c | 77 ----------------- drivers/clk/davinci/pll-dm365.c | 146 -------------------------------- drivers/clk/davinci/psc-dm355.c | 89 ------------------- drivers/clk/davinci/psc-dm365.c | 111 ------------------------ 5 files changed, 427 deletions(-) delete mode 100644 drivers/clk/davinci/pll-dm355.c delete mode 100644 drivers/clk/davinci/pll-dm365.c delete mode 100644 drivers/clk/davinci/psc-dm355.c delete mode 100644 drivers/clk/davinci/psc-dm365.c
drivers/clk/davinci/Makefile +0 -4
@@ -6,12 +6,8 @@ obj-$(CONFIG_ARCH_DAVINCI_DA8XX) += da8xx-cfgchip.o obj-y += pll.o obj-$(CONFIG_ARCH_DAVINCI_DA830) += pll-da830.o obj-$(CONFIG_ARCH_DAVINCI_DA850) += pll-da850.o -obj-$(CONFIG_ARCH_DAVINCI_DM355) += pll-dm355.o -obj-$(CONFIG_ARCH_DAVINCI_DM365) += pll-dm365.o obj-y += psc.o obj-$(CONFIG_ARCH_DAVINCI_DA830) += psc-da830.o obj-$(CONFIG_ARCH_DAVINCI_DA850) += psc-da850.o -obj-$(CONFIG_ARCH_DAVINCI_DM355) += psc-dm355.o -obj-$(CONFIG_ARCH_DAVINCI_DM365) += psc-dm365.o endif
drivers/clk/davinci/pll-dm355.c deleted +0 -77
77 lines not on this page · raw message
drivers/clk/davinci/pll-dm365.c deleted +0 -146
146 lines not on this page · raw message
drivers/clk/davinci/psc-dm355.c deleted +0 -89
89 lines not on this page · raw message
drivers/clk/davinci/psc-dm365.c deleted +0 -111
111 lines not on this page · raw message
Signature · 1 line
2.29.2
Re: [PATCH 04/14] clk: remove davinci dm3xx drivers
Quoted 8 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The davinci dm3xx machines are all removed, so the clk driver is no longer needed. The da8xx platforms are now using DT exclusively, so those drivers remain untouched.
Signed-off-by Arnd Bergmann <[email protected]>---
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 04/14] clk: remove davinci dm3xx drivers
In reply to Arnd BergmannQuoted 7 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The davinci dm3xx machines are all removed, so the clk driver is no longer needed. The da8xx platforms are now using DT exclusively, so those drivers remain untouched.
Signed-off-by Arnd Bergmann <[email protected]>
Yours,
Linus Walleij
Re: [PATCH 04/14] clk: remove davinci dm3xx drivers
In reply to Arnd BergmannQuoted 9 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The davinci dm3xx machines are all removed, so the clk driver is no longer needed. The da8xx platforms are now using DT exclusively, so those drivers remain untouched.
Signed-off-by Arnd Bergmann <[email protected]>---
Re: [PATCH 04/14] clk: remove davinci dm3xx drivers
In reply to Arnd BergmannQuoting Arnd Bergmann (2022-10-19 08:29:30)
Quoted 8 lines
From: Arnd Bergmann <[email protected]>
The davinci dm3xx machines are all removed, so the clk driver is no longer needed. The da8xx platforms are now using DT exclusively, so those drivers remain untouched.
Signed-off-by Arnd Bergmann <[email protected]>---
PATCH 5/14 usb: musb: remove unused davinci support
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The musb-davinci driver was only used on dm644x, which got removed in linux-6.0. The only remaining davinci machines are da8xx devicetree based and do not use this hardware.
--- drivers/usb/musb/Kconfig | 12 - drivers/usb/musb/Makefile | 2 - drivers/usb/musb/cppi_dma.c | 1547 ----------------------------------- drivers/usb/musb/davinci.c | 606 -------------- drivers/usb/musb/davinci.h | 103 --- 5 files changed, 2270 deletions(-) delete mode 100644 drivers/usb/musb/cppi_dma.c delete mode 100644 drivers/usb/musb/davinci.c delete mode 100644 drivers/usb/musb/davinci.h
drivers/usb/musb/Kconfig +0 -12
@@ -70,12 +70,6 @@ config USB_MUSB_SUNXI select GENERIC_PHY select SUNXI_SRAM -config USB_MUSB_DAVINCI - tristate "DaVinci" - depends on ARCH_DAVINCI_DMx - depends on NOP_USB_XCEIV - depends on BROKEN - config USB_MUSB_DA8XX tristate "DA8xx/OMAP-L1x" depends on ARCH_DAVINCI_DA8XX
@@ -161,12 +155,6 @@ config USB_INVENTRA_DMA help Enable DMA transfers using Mentor's engine. -config USB_TI_CPPI_DMA - bool 'TI CPPI (Davinci)' - depends on USB_MUSB_DAVINCI - help - Enable DMA transfers when TI CPPI DMA is available. - config USB_TI_CPPI41_DMA bool 'TI CPPI 4.1' depends on (ARCH_OMAP || ARCH_DAVINCI_DA8XX) && DMADEVICES
drivers/usb/musb/Makefile +0 -2
@@ -19,7 +19,6 @@ obj-$(CONFIG_USB_MUSB_OMAP2PLUS) += omap2430.o obj-$(CONFIG_USB_MUSB_AM35X) += am35x.o obj-$(CONFIG_USB_MUSB_DSPS) += musb_dsps.o obj-$(CONFIG_USB_MUSB_TUSB6010) += tusb6010.o -obj-$(CONFIG_USB_MUSB_DAVINCI) += davinci.o obj-$(CONFIG_USB_MUSB_DA8XX) += da8xx.o obj-$(CONFIG_USB_MUSB_UX500) += ux500.o obj-$(CONFIG_USB_MUSB_JZ4740) += jz4740.o
@@ -33,7 +32,6 @@ obj-$(CONFIG_USB_MUSB_POLARFIRE_SOC) += mpfs.o # though PIO is always there to back up DMA, and for ep0 musb_hdrc-$(CONFIG_USB_INVENTRA_DMA) += musbhsdma.o -musb_hdrc-$(CONFIG_USB_TI_CPPI_DMA) += cppi_dma.o musb_hdrc-$(CONFIG_USB_TUSB_OMAP_DMA) += tusb6010_omap.o musb_hdrc-$(CONFIG_USB_UX500_DMA) += ux500_dma.o musb_hdrc-$(CONFIG_USB_TI_CPPI41_DMA) += musb_cppi41.o
drivers/usb/musb/cppi_dma.c deleted +0 -1547
1,547 lines not on this page · raw message
drivers/usb/musb/davinci.c deleted +0 -606
606 lines not on this page · raw message
drivers/usb/musb/davinci.h deleted +0 -103
103 lines not on this page · raw message
Signature · 1 line
2.29.2
Re: [PATCH 05/14] usb: musb: remove unused davinci support
Quoted 9 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The musb-davinci driver was only used on dm644x, which got removed in linux-6.0. The only remaining davinci machines are da8xx devicetree based and do not use this hardware.
Signed-off-by Arnd Bergmann <[email protected]>---
PATCH 6/14 mfd: remove dm355evm_msp driver
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The DaVinci DM355EVM platform is gone after the removal of all unused board files, so the MTD device along with its sub-devices can be removed as well.
--- drivers/input/misc/Kconfig | 11 - drivers/input/misc/Makefile | 1 - drivers/input/misc/dm355evm_keys.c | 238 --------------- drivers/mfd/Kconfig | 8 - drivers/mfd/Makefile | 1 - drivers/mfd/dm355evm_msp.c | 454 ----------------------------- drivers/rtc/Kconfig | 6 - drivers/rtc/Makefile | 1 - drivers/rtc/rtc-dm355evm.c | 151 ---------- include/linux/mfd/dm355evm_msp.h | 79 ----- 10 files changed, 950 deletions(-) delete mode 100644 drivers/input/misc/dm355evm_keys.c delete mode 100644 drivers/mfd/dm355evm_msp.c delete mode 100644 drivers/rtc/rtc-dm355evm.c delete mode 100644 include/linux/mfd/dm355evm_msp.h
drivers/input/misc/Kconfig +0 -11
@@ -662,17 +662,6 @@ config INPUT_DA9063_ONKEY To compile this driver as a module, choose M here: the module will be called da9063_onkey. -config INPUT_DM355EVM - tristate "TI DaVinci DM355 EVM Keypad and IR Remote" - depends on MFD_DM355EVM_MSP - select INPUT_SPARSEKMAP - help - Supports the pushbuttons and IR remote used with - the DM355 EVM board. - - To compile this driver as a module, choose M here: the - module will be called dm355evm_keys. - config INPUT_WM831X_ON tristate "WM831X ON pin" depends on MFD_WM831X
drivers/input/misc/Makefile +0 -1
@@ -31,7 +31,6 @@ obj-$(CONFIG_INPUT_DA7280_HAPTICS) += da7280.o obj-$(CONFIG_INPUT_DA9052_ONKEY) += da9052_onkey.o obj-$(CONFIG_INPUT_DA9055_ONKEY) += da9055_onkey.o obj-$(CONFIG_INPUT_DA9063_ONKEY) += da9063_onkey.o -obj-$(CONFIG_INPUT_DM355EVM) += dm355evm_keys.o obj-$(CONFIG_INPUT_E3X0_BUTTON) += e3x0-button.o obj-$(CONFIG_INPUT_DRV260X_HAPTICS) += drv260x.o obj-$(CONFIG_INPUT_DRV2665_HAPTICS) += drv2665.o
drivers/input/misc/dm355evm_keys.c deleted +0 -238
238 lines not on this page · raw message
drivers/mfd/Kconfig +0 -8
@@ -1439,14 +1439,6 @@ config MFD_TI_AM335X_TSCADC To compile this driver as a module, choose M here: the module will be called ti_am335x_tscadc. -config MFD_DM355EVM_MSP - bool "TI DaVinci DM355 EVM microcontroller" - depends on I2C=y && MACH_DAVINCI_DM355_EVM - help - This driver supports the MSP430 microcontroller used on these - boards. MSP430 firmware manages resets and power sequencing, - inputs from buttons and the IR remote, LEDs, an RTC, and more. - config MFD_LP3943 tristate "TI/National Semiconductor LP3943 MFD Driver" depends on I2C
drivers/mfd/Makefile +0 -1
@@ -24,7 +24,6 @@ obj-$(CONFIG_MFD_TI_LP873X) += lp873x.o obj-$(CONFIG_MFD_TI_LP87565) += lp87565.o obj-$(CONFIG_MFD_DAVINCI_VOICECODEC) += davinci_voicecodec.o -obj-$(CONFIG_MFD_DM355EVM_MSP) += dm355evm_msp.o obj-$(CONFIG_MFD_TI_AM335X_TSCADC) += ti_am335x_tscadc.o obj-$(CONFIG_MFD_STA2X11) += sta2x11-mfd.o
drivers/mfd/dm355evm_msp.c deleted +0 -454
454 lines not on this page · raw message
drivers/rtc/Kconfig +0 -6
@@ -540,12 +540,6 @@ config RTC_DRV_BQ32K This driver can also be built as a module. If so, the module will be called rtc-bq32k. -config RTC_DRV_DM355EVM - tristate "TI DaVinci DM355 EVM RTC" - depends on MFD_DM355EVM_MSP - help - Supports the RTC firmware in the MSP430 on the DM355 EVM. - config RTC_DRV_TWL92330 bool "TI TWL92330/Menelaus" depends on MENELAUS
drivers/rtc/Makefile +0 -1
@@ -46,7 +46,6 @@ obj-$(CONFIG_RTC_DRV_DA9055) += rtc-da9055.o obj-$(CONFIG_RTC_DRV_DA9063) += rtc-da9063.o obj-$(CONFIG_RTC_DRV_DAVINCI) += rtc-davinci.o obj-$(CONFIG_RTC_DRV_DIGICOLOR) += rtc-digicolor.o -obj-$(CONFIG_RTC_DRV_DM355EVM) += rtc-dm355evm.o obj-$(CONFIG_RTC_DRV_DS1216) += rtc-ds1216.o obj-$(CONFIG_RTC_DRV_DS1286) += rtc-ds1286.o obj-$(CONFIG_RTC_DRV_DS1302) += rtc-ds1302.o
drivers/rtc/rtc-dm355evm.c deleted +0 -151
151 lines not on this page · raw message
include/linux/mfd/dm355evm_msp.h deleted +0 -79
79 lines not on this page · raw message
Signature · 1 line
2.29.2
Re: [PATCH 06/14] mfd: remove dm355evm_msp driver
Quoted 8 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The DaVinci DM355EVM platform is gone after the removal of all unused board files, so the MTD device along with its sub-devices can be removed as well.
Signed-off-by Arnd Bergmann <[email protected]>
Re: [PATCH 06/14] mfd: remove dm355evm_msp driver
In reply to Arnd BergmannQuoted 7 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The DaVinci DM355EVM platform is gone after the removal of all unused board files, so the MTD device along with its sub-devices can be removed as well.
Signed-off-by Arnd Bergmann <[email protected]>
Quoted 16 lines
--- drivers/input/misc/Kconfig | 11 - drivers/input/misc/Makefile | 1 - drivers/input/misc/dm355evm_keys.c | 238 --------------- drivers/mfd/Kconfig | 8 - drivers/mfd/Makefile | 1 - drivers/mfd/dm355evm_msp.c | 454 ----------------------------- drivers/rtc/Kconfig | 6 - drivers/rtc/Makefile | 1 - drivers/rtc/rtc-dm355evm.c | 151 ---------- include/linux/mfd/dm355evm_msp.h | 79 ----- 10 files changed, 950 deletions(-) delete mode 100644 drivers/input/misc/dm355evm_keys.c delete mode 100644 drivers/mfd/dm355evm_msp.c delete mode 100644 drivers/rtc/rtc-dm355evm.c delete mode 100644 include/linux/mfd/dm355evm_msp.h
Signature · 1 line
Lee Jones [李琼斯]
Lee Jones
maintainerRe: [PATCH 06/14] mfd: remove dm355evm_msp driver
Quoted 26 lines · Lee Jones
Quoted 7 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The DaVinci DM355EVM platform is gone after the removal of all unused board files, so the MTD device along with its sub-devices can be removed as well.
Signed-off-by Arnd Bergmann <[email protected]>Quoted 16 lines
--- drivers/input/misc/Kconfig | 11 - drivers/input/misc/Makefile | 1 - drivers/input/misc/dm355evm_keys.c | 238 --------------- drivers/mfd/Kconfig | 8 - drivers/mfd/Makefile | 1 - drivers/mfd/dm355evm_msp.c | 454 ----------------------------- drivers/rtc/Kconfig | 6 - drivers/rtc/Makefile | 1 - drivers/rtc/rtc-dm355evm.c | 151 ---------- include/linux/mfd/dm355evm_msp.h | 79 ----- 10 files changed, 950 deletions(-) delete mode 100644 drivers/input/misc/dm355evm_keys.c delete mode 100644 drivers/mfd/dm355evm_msp.c delete mode 100644 drivers/rtc/rtc-dm355evm.c delete mode 100644 include/linux/mfd/dm355evm_msp.h
Quoted 1 line
Acked-by Lee Jones <[email protected]>
Any reason not to do this per-subsystem?
Signature · 1 line
Lee Jones [李琼斯]
PATCH 7/14 input: remove davinci keyboard driver
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The dm365evm board was removed, and no other users of this device exist.
--- drivers/input/keyboard/Kconfig | 10 - drivers/input/keyboard/Makefile | 1 - drivers/input/keyboard/davinci_keyscan.c | 315 ----------------------- 3 files changed, 326 deletions(-) delete mode 100644 drivers/input/keyboard/davinci_keyscan.c
drivers/input/keyboard/Kconfig +0 -10
@@ -657,16 +657,6 @@ config KEYBOARD_SUN4I_LRADC To compile this driver as a module, choose M here: the module will be called sun4i-lradc-keys. -config KEYBOARD_DAVINCI - tristate "TI DaVinci Key Scan" - depends on ARCH_DAVINCI_DM365 - help - Say Y to enable keypad module support for the TI DaVinci - platforms (DM365). - - To compile this driver as a module, choose M here: the - module will be called davinci_keyscan. - config KEYBOARD_IPAQ_MICRO tristate "Buttons on Micro SoC (iPaq h3100,h3600,h3700)" depends on MFD_IPAQ_MICRO
drivers/input/keyboard/Makefile +0 -1
@@ -18,7 +18,6 @@ obj-$(CONFIG_KEYBOARD_CAP11XX) += cap11xx.o obj-$(CONFIG_KEYBOARD_CLPS711X) += clps711x-keypad.o obj-$(CONFIG_KEYBOARD_CROS_EC) += cros_ec_keyb.o obj-$(CONFIG_KEYBOARD_CYPRESS_SF) += cypress-sf.o -obj-$(CONFIG_KEYBOARD_DAVINCI) += davinci_keyscan.o obj-$(CONFIG_KEYBOARD_DLINK_DIR685) += dlink-dir685-touchkeys.o obj-$(CONFIG_KEYBOARD_EP93XX) += ep93xx_keypad.o obj-$(CONFIG_KEYBOARD_GOLDFISH_EVENTS) += goldfish_events.o
drivers/input/keyboard/davinci_keyscan.c deleted +0 -315
315 lines not on this page · raw message
Signature · 1 line
2.29.2
Re: [PATCH 07/14] input: remove davinci keyboard driver
Quoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The dm365evm board was removed, and no other users of this device exist.
Signed-off-by Arnd Bergmann <[email protected]>
Quoted 363 lines
--- drivers/input/keyboard/Kconfig | 10 - drivers/input/keyboard/Makefile | 1 - drivers/input/keyboard/davinci_keyscan.c | 315 ----------------------- 3 files changed, 326 deletions(-) delete mode 100644 drivers/input/keyboard/davinci_keyscan.cdrivers/input/keyboard/Kconfig +0
-10@@ -657,16 +657,6 @@ config KEYBOARD_SUN4I_LRADC To compile this driver as a module, choose M here: the module will be called sun4i-lradc-keys. -config KEYBOARD_DAVINCI - tristate "TI DaVinci Key Scan" - depends on ARCH_DAVINCI_DM365 - help - Say Y to enable keypad module support for the TI DaVinci - platforms (DM365). - - To compile this driver as a module, choose M here: the - module will be called davinci_keyscan. - config KEYBOARD_IPAQ_MICRO tristate "Buttons on Micro SoC (iPaq h3100,h3600,h3700)" depends on MFD_IPAQ_MICROdrivers/input/keyboard/Makefile +0
-1@@ -18,7 +18,6 @@ obj-$(CONFIG_KEYBOARD_CAP11XX) += cap11xx.o obj-$(CONFIG_KEYBOARD_CLPS711X) += clps711x-keypad.o obj-$(CONFIG_KEYBOARD_CROS_EC) += cros_ec_keyb.o obj-$(CONFIG_KEYBOARD_CYPRESS_SF) += cypress-sf.o -obj-$(CONFIG_KEYBOARD_DAVINCI) += davinci_keyscan.o obj-$(CONFIG_KEYBOARD_DLINK_DIR685) += dlink-dir685-touchkeys.o obj-$(CONFIG_KEYBOARD_EP93XX) += ep93xx_keypad.o obj-$(CONFIG_KEYBOARD_GOLDFISH_EVENTS) += goldfish_events.odrivers/input/keyboard/davinci_keyscan.c deleted +0
-315@@ -1,315 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* -* DaVinci Key Scan Driver for TI platforms -* -* Copyright (C) 2009 Texas Instruments, Inc -* -* Author: Miguel Aguilar <[email protected]> -* -* Initial Code: Sandeep Paulraj <[email protected]> -*/ -#include <linux/module.h> -#include <linux/init.h> -#include <linux/interrupt.h> -#include <linux/types.h> -#include <linux/input.h> -#include <linux/kernel.h> -#include <linux/delay.h> -#include <linux/platform_device.h> -#include <linux/errno.h> -#include <linux/slab.h> - -#include <linux/platform_data/keyscan-davinci.h> - -/* Key scan registers */ -#define DAVINCI_KEYSCAN_KEYCTRL 0x0000 -#define DAVINCI_KEYSCAN_INTENA 0x0004 -#define DAVINCI_KEYSCAN_INTFLAG 0x0008 -#define DAVINCI_KEYSCAN_INTCLR 0x000c -#define DAVINCI_KEYSCAN_STRBWIDTH 0x0010 -#define DAVINCI_KEYSCAN_INTERVAL 0x0014 -#define DAVINCI_KEYSCAN_CONTTIME 0x0018 -#define DAVINCI_KEYSCAN_CURRENTST 0x001c -#define DAVINCI_KEYSCAN_PREVSTATE 0x0020 -#define DAVINCI_KEYSCAN_EMUCTRL 0x0024 -#define DAVINCI_KEYSCAN_IODFTCTRL 0x002c - -/* Key Control Register (KEYCTRL) */ -#define DAVINCI_KEYSCAN_KEYEN 0x00000001 -#define DAVINCI_KEYSCAN_PREVMODE 0x00000002 -#define DAVINCI_KEYSCAN_CHATOFF 0x00000004 -#define DAVINCI_KEYSCAN_AUTODET 0x00000008 -#define DAVINCI_KEYSCAN_SCANMODE 0x00000010 -#define DAVINCI_KEYSCAN_OUTTYPE 0x00000020 - -/* Masks for the interrupts */ -#define DAVINCI_KEYSCAN_INT_CONT 0x00000008 -#define DAVINCI_KEYSCAN_INT_OFF 0x00000004 -#define DAVINCI_KEYSCAN_INT_ON 0x00000002 -#define DAVINCI_KEYSCAN_INT_CHANGE 0x00000001 -#define DAVINCI_KEYSCAN_INT_ALL 0x0000000f - -struct davinci_ks { -struct input_dev *input; -struct davinci_ks_platform_data *pdata; -int irq; -void __iomem *base; -resource_size_t pbase; -size_t base_size; -unsigned short keymap[]; -}; - -/* Initializing the kp Module */ -static int __init davinci_ks_initialize (struct davinci_ks *davinci_ks) -{ -struct device *dev = &davinci_ks->input->dev; -struct davinci_ks_platform_data *pdata = davinci_ks->pdata; -u32 matrix_ctrl; - -/* Enable all interrupts */ -__raw_writel (DAVINCI_KEYSCAN_INT_ALL , - davinci_ks->base +DAVINCI_KEYSCAN_INTENA ); - -/* Clear interrupts if any */ -__raw_writel (DAVINCI_KEYSCAN_INT_ALL , - davinci_ks->base +DAVINCI_KEYSCAN_INTCLR ); - -/* Setup the scan period = strobe + interval */ -__raw_writel (pdata->strobe, - davinci_ks->base +DAVINCI_KEYSCAN_STRBWIDTH ); -__raw_writel (pdata->interval, - davinci_ks->base +DAVINCI_KEYSCAN_INTERVAL ); -__raw_writel (0x01 , - davinci_ks->base +DAVINCI_KEYSCAN_CONTTIME ); - -/* Define matrix type */ -switch (pdata->matrix_type) { -case DAVINCI_KEYSCAN_MATRIX_4X4 : - matrix_ctrl =0 ; -break ; -case DAVINCI_KEYSCAN_MATRIX_5X3 : - matrix_ctrl = (1 <<6 ); -break ; -default : -dev_err (dev->parent,"wrong matrix type\n" ); -return -EINVAL ; - } - -/* Enable key scan module and set matrix type */ -__raw_writel (DAVINCI_KEYSCAN_AUTODET |DAVINCI_KEYSCAN_KEYEN | - matrix_ctrl, davinci_ks->base +DAVINCI_KEYSCAN_KEYCTRL ); - -return 0 ; -} - -static irqreturn_t davinci_ks_interrupt (int irq,void *dev_id) -{ -struct davinci_ks *davinci_ks = dev_id; -struct device *dev = &davinci_ks->input->dev; -unsigned short *keymap = davinci_ks->keymap; -int keymapsize = davinci_ks->pdata->keymapsize; -u32 prev_status, new_status, changed; -bool release; -int keycode =KEY_UNKNOWN ; -int i; - -/* Disable interrupt */ -__raw_writel (0x0 , davinci_ks->base +DAVINCI_KEYSCAN_INTENA ); - -/* Reading previous and new status of the key scan */ - prev_status =__raw_readl (davinci_ks->base +DAVINCI_KEYSCAN_PREVSTATE ); - new_status =__raw_readl (davinci_ks->base +DAVINCI_KEYSCAN_CURRENTST ); - - changed = prev_status ^ new_status; - -if (changed) { -/* -* It goes through all bits in 'changed' to ensure -* that no key changes are being missed -*/ -for (i =0 ; i < keymapsize; i++) { -if ((changed>>i) &0x1 ) { - keycode = keymap[i]; - release = (new_status >> i) &0x1 ; -dev_dbg (dev->parent,"key %d %s\n" , keycode, - release ?"released" :"pressed" ); -input_report_key (davinci_ks->input, keycode, - !release); -input_sync (davinci_ks->input); - } - } -/* Clearing interrupt */ -__raw_writel (DAVINCI_KEYSCAN_INT_ALL , - davinci_ks->base +DAVINCI_KEYSCAN_INTCLR ); - } - -/* Enable interrupts */ -__raw_writel (0x1 , davinci_ks->base +DAVINCI_KEYSCAN_INTENA ); - -return IRQ_HANDLED ; -} - -static int __init davinci_ks_probe (struct platform_device *pdev) -{ -struct davinci_ks *davinci_ks; -struct input_dev *key_dev; -struct resource *res, *mem; -struct device *dev = &pdev->dev; -struct davinci_ks_platform_data *pdata =dev_get_platdata (dev); -int error, i; - -if (pdata->device_enable) { - error = pdata->device_enable (dev); -if (error <0 ) { -dev_dbg (dev,"device enable function failed\n" ); -return error; - } - } - -if (!pdata->keymap) { -dev_dbg (dev,"no keymap from pdata\n" ); -return -EINVAL ; - } - - davinci_ks =kzalloc (sizeof (struct davinci_ks ) + -sizeof (unsigned short ) * pdata->keymapsize,GFP_KERNEL ); -if (!davinci_ks) { -dev_dbg (dev,"could not allocate memory for private data\n" ); -return -ENOMEM ; - } - -memcpy (davinci_ks->keymap, pdata->keymap, -sizeof (unsigned short ) * pdata->keymapsize); - - key_dev =input_allocate_device (); -if (!key_dev) { -dev_dbg (dev,"could not allocate input device\n" ); - error = -ENOMEM ; - goto fail1; - } - - davinci_ks->input = key_dev; - - davinci_ks->irq =platform_get_irq (pdev,0 ); -if (davinci_ks->irq <0 ) { - error = davinci_ks->irq; - goto fail2; - } - - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -if (!res) { -dev_err (dev,"no mem resource\n" ); - error = -EINVAL ; - goto fail2; - } - - davinci_ks->pbase = res->start; - davinci_ks->base_size =resource_size (res); - - mem =request_mem_region (davinci_ks->pbase, davinci_ks->base_size, - pdev->name); -if (!mem) { -dev_err (dev,"key scan registers at %08x are not free\n" , - davinci_ks->pbase); - error = -EBUSY ; - goto fail2; - } - - davinci_ks->base =ioremap (davinci_ks->pbase, davinci_ks->base_size); -if (!davinci_ks->base) { -dev_err (dev,"can't ioremap MEM resource.\n" ); - error = -ENOMEM ; - goto fail3; - } - -/* Enable auto repeat feature of Linux input subsystem */ -if (pdata->rep) -__set_bit (EV_REP , key_dev->evbit); - -/* Setup input device */ -__set_bit (EV_KEY , key_dev->evbit); - -/* Setup the platform data */ - davinci_ks->pdata = pdata; - -for (i =0 ; i < davinci_ks->pdata->keymapsize; i++) -__set_bit (davinci_ks->pdata->keymap[i], key_dev->keybit); - - key_dev->name ="davinci_keyscan" ; - key_dev->phys ="davinci_keyscan/input0" ; - key_dev->dev.parent = dev; - key_dev->id.bustype =BUS_HOST ; - key_dev->id.vendor =0x0001 ; - key_dev->id.product =0x0001 ; - key_dev->id.version =0x0001 ; - key_dev->keycode = davinci_ks->keymap; - key_dev->keycodesize =sizeof (davinci_ks->keymap[0 ]); - key_dev->keycodemax = davinci_ks->pdata->keymapsize; - - error =input_register_device (davinci_ks->input); -if (error <0 ) { -dev_err (dev,"unable to register davinci key scan device\n" ); - goto fail4; - } - - error =request_irq (davinci_ks->irq, davinci_ks_interrupt, -0 , pdev->name, davinci_ks); -if (error <0 ) { -dev_err (dev,"unable to register davinci key scan interrupt\n" ); - goto fail5; - } - - error =davinci_ks_initialize (davinci_ks); -if (error <0 ) { -dev_err (dev,"unable to initialize davinci key scan device\n" ); - goto fail6; - } - -platform_set_drvdata (pdev, davinci_ks); -return 0 ; - -fail6: -free_irq (davinci_ks->irq, davinci_ks); -fail5: -input_unregister_device (davinci_ks->input); - key_dev =NULL ; -fail4: -iounmap (davinci_ks->base); -fail3: -release_mem_region (davinci_ks->pbase, davinci_ks->base_size); -fail2: -input_free_device (key_dev); -fail1: -kfree (davinci_ks); - -return error; -} - -static int davinci_ks_remove (struct platform_device *pdev) -{ -struct davinci_ks *davinci_ks =platform_get_drvdata (pdev); - -free_irq (davinci_ks->irq, davinci_ks); - -input_unregister_device (davinci_ks->input); - -iounmap (davinci_ks->base); -release_mem_region (davinci_ks->pbase, davinci_ks->base_size); - -kfree (davinci_ks); - -return 0 ; -} - -static struct platform_driver davinci_ks_driver = { - .driver = { - .name ="davinci_keyscan" , - }, - .remove = davinci_ks_remove, -}; - -module_platform_driver_probe (davinci_ks_driver, davinci_ks_probe); - -MODULE_AUTHOR ("Miguel Aguilar" ); -MODULE_DESCRIPTION ("Texas Instruments DaVinci Key Scan Driver" ); -MODULE_LICENSE ("GPL" );Signature · 1 line
2.29.2
Re: [PATCH 07/14] input: remove davinci keyboard driver
In reply to Arnd BergmannQuoted 8 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The dm365evm board was removed, and no other users of this device exist.
Signed-off-by Arnd Bergmann <[email protected]>---
PATCH 8/14 rtc: remove davinci rtc driver
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The Davinci dm365 SoC support was removed, so the rtc driver has no remaining users.
--- drivers/rtc/Kconfig | 10 - drivers/rtc/Makefile | 1 - drivers/rtc/rtc-davinci.c | 512 -------------------------------------- 3 files changed, 523 deletions(-) delete mode 100644 drivers/rtc/rtc-davinci.c
drivers/rtc/Kconfig +0 -10
@@ -1345,16 +1345,6 @@ config RTC_DRV_ASM9260 This driver can also be built as a module. If so, the module will be called rtc-asm9260. -config RTC_DRV_DAVINCI - tristate "TI DaVinci RTC" - depends on ARCH_DAVINCI_DM365 || COMPILE_TEST - help - If you say yes here you get support for the RTC on the - DaVinci platforms (DM365). - - This driver can also be built as a module. If so, the module - will be called rtc-davinci. - config RTC_DRV_DIGICOLOR tristate "Conexant Digicolor RTC" depends on ARCH_DIGICOLOR || COMPILE_TEST
drivers/rtc/Makefile +0 -1
@@ -44,7 +44,6 @@ obj-$(CONFIG_RTC_DRV_CROS_EC) += rtc-cros-ec.o obj-$(CONFIG_RTC_DRV_DA9052) += rtc-da9052.o obj-$(CONFIG_RTC_DRV_DA9055) += rtc-da9055.o obj-$(CONFIG_RTC_DRV_DA9063) += rtc-da9063.o -obj-$(CONFIG_RTC_DRV_DAVINCI) += rtc-davinci.o obj-$(CONFIG_RTC_DRV_DIGICOLOR) += rtc-digicolor.o obj-$(CONFIG_RTC_DRV_DS1216) += rtc-ds1216.o obj-$(CONFIG_RTC_DRV_DS1286) += rtc-ds1286.o
drivers/rtc/rtc-davinci.c deleted +0 -512
512 lines not on this page · raw message
Signature · 1 line
2.29.2
Re: [PATCH 08/14] rtc: remove davinci rtc driver
Quoted 8 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The Davinci dm365 SoC support was removed, so the rtc driver has no remaining users.
Signed-off-by Arnd Bergmann <[email protected]>---
PATCH 9/14 ASoC: remove unused davinci support
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The dm644x and dm3xx SoCs have been removed, as have the da850_evm/da830_evm machines, the remaining machines all use the DT based probing and do not use the vcif driver.
--- sound/soc/ti/Kconfig | 40 ------ sound/soc/ti/Makefile | 2 - sound/soc/ti/davinci-evm.c | 267 +----------------------------------- sound/soc/ti/davinci-vcif.c | 247 --------------------------------- 4 files changed, 3 insertions(+), 553 deletions(-) delete mode 100644 sound/soc/ti/davinci-vcif.c
sound/soc/ti/Kconfig +0 -40
@@ -40,13 +40,6 @@ config SND_SOC_DAVINCI_MCASP - Keystone devices - K3 devices (am654, j721e) -config SND_SOC_DAVINCI_VCIF - tristate "daVinci Voice Interface (VCIF) support" - depends on ARCH_DAVINCI || COMPILE_TEST - select SND_SOC_TI_EDMA_PCM - help - Say Y or M here if you want audio support via daVinci VCIF. - config SND_SOC_OMAP_DMIC tristate "Digital Microphone Module (DMIC) support" depends on ARCH_OMAP4 || SOC_OMAP5 || COMPILE_TEST && COMMON_CLK
@@ -177,14 +170,6 @@ config SND_SOC_OMAP_OSK5912 config SND_SOC_DAVINCI_EVM tristate "SoC Audio support for DaVinci EVMs" depends on ARCH_DAVINCI && I2C - select SND_SOC_DAVINCI_ASP if MACH_DAVINCI_DM355_EVM - select SND_SOC_DAVINCI_ASP if SND_SOC_DM365_AIC3X_CODEC - select SND_SOC_DAVINCI_VCIF if SND_SOC_DM365_VOICE_CODEC - select SND_SOC_DAVINCI_ASP if MACH_DAVINCI_EVM # DM6446 - select SND_SOC_DAVINCI_MCASP if MACH_DAVINCI_DM6467_EVM - select SND_SOC_SPDIF if MACH_DAVINCI_DM6467_EVM - select SND_SOC_DAVINCI_MCASP if MACH_DAVINCI_DA830_EVM - select SND_SOC_DAVINCI_MCASP if MACH_DAVINCI_DA850_EVM select SND_SOC_TLV320AIC3X help Say Y if you want to add support for SoC audio on the following TI
@@ -196,31 +181,6 @@ config SND_SOC_DAVINCI_EVM - DM830 - DM850 -choice - prompt "DM365 codec select" - depends on SND_SOC_DAVINCI_EVM - depends on MACH_DAVINCI_DM365_EVM - -config SND_SOC_DM365_AIC3X_CODEC - bool "Audio Codec - AIC3101" - help - Say Y if you want to add support for AIC3101 audio codec - -config SND_SOC_DM365_VOICE_CODEC - bool "Voice Codec - CQ93VC" - help - Say Y if you want to add support for SoC On-chip voice codec -endchoice - -config SND_SOC_DM365_SELECT_VOICE_CODECS - def_tristate y - depends on SND_SOC_DM365_VOICE_CODEC && SND_SOC - select MFD_DAVINCI_VOICECODEC - select SND_SOC_CQ0093VC - help - The is an internal symbol needed to ensure that the codec - and MFD driver can be built as loadable modules if necessary. - config SND_SOC_J721E_EVM tristate "SoC Audio support for j721e EVM" depends on ARCH_K3 || COMPILE_TEST && COMMON_CLK
sound/soc/ti/Makefile +0 -2
@@ -12,14 +12,12 @@ obj-$(CONFIG_SND_SOC_TI_UDMA_PCM) += snd-soc-ti-udma.o # CPU DAI drivers snd-soc-davinci-asp-objs := davinci-i2s.o snd-soc-davinci-mcasp-objs := davinci-mcasp.o -snd-soc-davinci-vcif-objs := davinci-vcif.o snd-soc-omap-dmic-objs := omap-dmic.o snd-soc-omap-mcbsp-objs := omap-mcbsp.o omap-mcbsp-st.o snd-soc-omap-mcpdm-objs := omap-mcpdm.o obj-$(CONFIG_SND_SOC_DAVINCI_ASP) += snd-soc-davinci-asp.o obj-$(CONFIG_SND_SOC_DAVINCI_MCASP) += snd-soc-davinci-mcasp.o -obj-$(CONFIG_SND_SOC_DAVINCI_VCIF) += snd-soc-davinci-vcif.o obj-$(CONFIG_SND_SOC_OMAP_DMIC) += snd-soc-omap-dmic.o obj-$(CONFIG_SND_SOC_OMAP_MCBSP) += snd-soc-omap-mcbsp.o obj-$(CONFIG_SND_SOC_OMAP_MCPDM) += snd-soc-omap-mcpdm.o
sound/soc/ti/davinci-evm.c +3 -264
288 lines not on this page · raw message
sound/soc/ti/davinci-vcif.c deleted +0 -247
247 lines not on this page · raw message
Signature · 1 line
2.29.2
Re: [PATCH 09/14] ASoC: remove unused davinci support
Quoted 5 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The dm644x and dm3xx SoCs have been removed, as have the da850_evm/da830_evm machines, the remaining machines all use the DT based probing and do not use the vcif driver.
PATCH 10/14 mfd: remove davinci voicecodec driver
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The ASoC davinci voicecodec support is no longer used after the removal of the dm3xx SoC platform, so the MFD driver is never selected.
--- drivers/mfd/Kconfig | 5 -- drivers/mfd/Makefile | 2 - drivers/mfd/davinci_voicecodec.c | 136 ------------------------------- 3 files changed, 143 deletions(-) delete mode 100644 drivers/mfd/davinci_voicecodec.c
drivers/mfd/Kconfig +0 -5
@@ -1423,11 +1423,6 @@ config MFD_SYSCON Select this option to enable accessing system control registers via regmap. -config MFD_DAVINCI_VOICECODEC - tristate - select MFD_CORE - select REGMAP_MMIO - config MFD_TI_AM335X_TSCADC tristate "TI ADC / Touch Screen chip support" select MFD_CORE
drivers/mfd/Makefile +0 -2
@@ -22,8 +22,6 @@ obj-$(CONFIG_HTC_PASIC3) += htc-pasic3.o obj-$(CONFIG_MFD_TI_LP873X) += lp873x.o obj-$(CONFIG_MFD_TI_LP87565) += lp87565.o - -obj-$(CONFIG_MFD_DAVINCI_VOICECODEC) += davinci_voicecodec.o obj-$(CONFIG_MFD_TI_AM335X_TSCADC) += ti_am335x_tscadc.o obj-$(CONFIG_MFD_STA2X11) += sta2x11-mfd.o
drivers/mfd/davinci_voicecodec.c deleted +0 -136
136 lines not on this page · raw message
Signature · 1 line
2.29.2
Re: [PATCH 10/14] mfd: remove davinci voicecodec driver
Quoted 9 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The ASoC davinci voicecodec support is no longer used after the removal of the dm3xx SoC platform, so the MFD driver is never selected.
Signed-off-by Arnd Bergmann <[email protected]>---
Re: [PATCH 10/14] mfd: remove davinci voicecodec driver
In reply to Arnd BergmannQuoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The ASoC davinci voicecodec support is no longer used after the removal of the dm3xx SoC platform, so the MFD driver is never selected.
Quoted 7 lines
Signed-off-by Arnd Bergmann <[email protected]>--- drivers/mfd/Kconfig | 5 -- drivers/mfd/Makefile | 2 - drivers/mfd/davinci_voicecodec.c | 136 ------------------------------- 3 files changed, 143 deletions(-) delete mode 100644 drivers/mfd/davinci_voicecodec.c
Applied, thanks.
Signature · 1 line
Lee Jones [李琼斯]
PATCH 11/14 pata: remove palmchip bk3710 driver
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
This device was used only on the davinci dm644x platform that is now gone, and no references to the device remain in the kernel.
--- drivers/ata/Kconfig | 10 - drivers/ata/Makefile | 1 - drivers/ata/pata_bk3710.c | 380 -------------------------------------- 3 files changed, 391 deletions(-) delete mode 100644 drivers/ata/pata_bk3710.c
drivers/ata/Kconfig +0 -10
@@ -609,16 +609,6 @@ config PATA_ATP867X If unsure, say N. -config PATA_BK3710 - tristate "Palmchip BK3710 PATA support" - depends on ARCH_DAVINCI || COMPILE_TEST - select PATA_TIMINGS - help - This option enables support for the integrated IDE controller on - the TI DaVinci SoC. - - If unsure, say N. - config PATA_CMD64X tristate "CMD64x PATA support" depends on PCI
drivers/ata/Makefile +0 -1
@@ -54,7 +54,6 @@ obj-$(CONFIG_PATA_AMD) += pata_amd.o obj-$(CONFIG_PATA_ARTOP) += pata_artop.o obj-$(CONFIG_PATA_ATIIXP) += pata_atiixp.o obj-$(CONFIG_PATA_ATP867X) += pata_atp867x.o -obj-$(CONFIG_PATA_BK3710) += pata_bk3710.o obj-$(CONFIG_PATA_CMD64X) += pata_cmd64x.o obj-$(CONFIG_PATA_CS5520) += pata_cs5520.o obj-$(CONFIG_PATA_CS5530) += pata_cs5530.o
drivers/ata/pata_bk3710.c deleted +0 -380
380 lines not on this page · raw message
Signature · 1 line
2.29.2
Re: [PATCH 11/14] pata: remove palmchip bk3710 driver
Quoted 7 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
This device was used only on the davinci dm644x platform that is now gone, and no references to the device remain in the kernel.
Signed-off-by Arnd Bergmann <[email protected]>
Great, one less pata/ide driver !
I can queue this in ata tree. I do have some changes in ata Kconfig queued already, but they should not conflict.
Cheers.
Quoted 426 lines
--- drivers/ata/Kconfig | 10 - drivers/ata/Makefile | 1 - drivers/ata/pata_bk3710.c | 380 -------------------------------------- 3 files changed, 391 deletions(-) delete mode 100644 drivers/ata/pata_bk3710.cdrivers/ata/Kconfig +0
-10@@ -609,16 +609,6 @@ config PATA_ATP867X If unsure, say N. -config PATA_BK3710 - tristate "Palmchip BK3710 PATA support" - depends on ARCH_DAVINCI || COMPILE_TEST - select PATA_TIMINGS - help - This option enables support for the integrated IDE controller on - the TI DaVinci SoC. - - If unsure, say N. - config PATA_CMD64X tristate "CMD64x PATA support" depends on PCIdrivers/ata/Makefile +0
-1@@ -54,7 +54,6 @@ obj-$(CONFIG_PATA_AMD) += pata_amd.o obj-$(CONFIG_PATA_ARTOP) += pata_artop.o obj-$(CONFIG_PATA_ATIIXP) += pata_atiixp.o obj-$(CONFIG_PATA_ATP867X) += pata_atp867x.o -obj-$(CONFIG_PATA_BK3710) += pata_bk3710.o obj-$(CONFIG_PATA_CMD64X) += pata_cmd64x.o obj-$(CONFIG_PATA_CS5520) += pata_cs5520.o obj-$(CONFIG_PATA_CS5530) += pata_cs5530.odrivers/ata/pata_bk3710.c deleted +0
-380@@ -1,380 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 - -/* -* Palmchip BK3710 PATA controller driver -* -* Copyright (c) 2017 Samsung Electronics Co., Ltd. -* http://www.samsung.com -* -* Based on palm_bk3710.c: -* -* Copyright (C) 2006 Texas Instruments. -* Copyright (C) 2007 MontaVista Software, Inc., <[email protected]> -*/ - -#include <linux/ata.h> -#include <linux/clk.h> -#include <linux/delay.h> -#include <linux/init.h> -#include <linux/ioport.h> -#include <linux/kernel.h> -#include <linux/libata.h> -#include <linux/module.h> -#include <linux/platform_device.h> -#include <linux/types.h> - -#define DRV_NAME "pata_bk3710" - -#define BK3710_TF_OFFSET 0x1F0 -#define BK3710_CTL_OFFSET 0x3F6 - -#define BK3710_BMISP 0x02 -#define BK3710_IDETIMP 0x40 -#define BK3710_UDMACTL 0x48 -#define BK3710_MISCCTL 0x50 -#define BK3710_REGSTB 0x54 -#define BK3710_REGRCVR 0x58 -#define BK3710_DATSTB 0x5C -#define BK3710_DATRCVR 0x60 -#define BK3710_DMASTB 0x64 -#define BK3710_DMARCVR 0x68 -#define BK3710_UDMASTB 0x6C -#define BK3710_UDMATRP 0x70 -#define BK3710_UDMAENV 0x74 -#define BK3710_IORDYTMP 0x78 - -static struct scsi_host_template pata_bk3710_sht = { -ATA_BMDMA_SHT (DRV_NAME ), -}; - -static unsigned int ideclk_period;/* in nanoseconds */ - -struct pata_bk3710_udmatiming { -unsigned int rptime;/* tRP -- Ready to pause time (nsec) */ -unsigned int cycletime;/* tCYCTYP2/2 -- avg Cycle Time (nsec) */ -/* tENV is always a minimum of 20 nsec */ -}; - -static const struct pata_bk3710_udmatiming pata_bk3710_udmatimings[6 ] = { - {160 ,240 /2 },/* UDMA Mode 0 */ - {125 ,160 /2 },/* UDMA Mode 1 */ - {100 ,120 /2 },/* UDMA Mode 2 */ - {100 ,90 /2 },/* UDMA Mode 3 */ - {100 ,60 /2 },/* UDMA Mode 4 */ - {85 ,40 /2 },/* UDMA Mode 5 */ -}; - -static void pata_bk3710_setudmamode (void __iomem *base,unsigned int dev, -unsigned int mode) -{ -u32 val32; -u16 val16; -u8 tenv, trp, t0; - -/* DMA Data Setup */ - t0 =DIV_ROUND_UP (pata_bk3710_udmatimings[mode].cycletime, - ideclk_period) -1 ; - tenv =DIV_ROUND_UP (20 , ideclk_period) -1 ; - trp =DIV_ROUND_UP (pata_bk3710_udmatimings[mode].rptime, - ideclk_period) -1 ; - -/* udmastb Ultra DMA Access Strobe Width */ - val32 =ioread32 (base +BK3710_UDMASTB ) & (0xFF << (dev ?0 :8 )); - val32 |= t0 << (dev ?8 :0 ); -iowrite32 (val32, base +BK3710_UDMASTB ); - -/* udmatrp Ultra DMA Ready to Pause Time */ - val32 =ioread32 (base +BK3710_UDMATRP ) & (0xFF << (dev ?0 :8 )); - val32 |= trp << (dev ?8 :0 ); -iowrite32 (val32, base +BK3710_UDMATRP ); - -/* udmaenv Ultra DMA envelop Time */ - val32 =ioread32 (base +BK3710_UDMAENV ) & (0xFF << (dev ?0 :8 )); - val32 |= tenv << (dev ?8 :0 ); -iowrite32 (val32, base +BK3710_UDMAENV ); - -/* Enable UDMA for Device */ - val16 =ioread16 (base +BK3710_UDMACTL ) | (1 << dev); -iowrite16 (val16, base +BK3710_UDMACTL ); -} - -static void pata_bk3710_setmwdmamode (void __iomem *base,unsigned int dev, -unsigned short min_cycle, -unsigned int mode) -{ -const struct ata_timing *t; -int cycletime; -u32 val32; -u16 val16; -u8 td, tkw, t0; - - t =ata_timing_find_mode (mode); - cycletime =max_t (int, t->cycle, min_cycle); - -/* DMA Data Setup */ - t0 =DIV_ROUND_UP (cycletime, ideclk_period); - td =DIV_ROUND_UP (t->active, ideclk_period); - tkw = t0 - td -1 ; - td--; - - val32 =ioread32 (base +BK3710_DMASTB ) & (0xFF << (dev ?0 :8 )); - val32 |= td << (dev ?8 :0 ); -iowrite32 (val32, base +BK3710_DMASTB ); - - val32 =ioread32 (base +BK3710_DMARCVR ) & (0xFF << (dev ?0 :8 )); - val32 |= tkw << (dev ?8 :0 ); -iowrite32 (val32, base +BK3710_DMARCVR ); - -/* Disable UDMA for Device */ - val16 =ioread16 (base +BK3710_UDMACTL ) & ~(1 << dev); -iowrite16 (val16, base +BK3710_UDMACTL ); -} - -static void pata_bk3710_set_dmamode (struct ata_port *ap, -struct ata_device *adev) -{ -void __iomem *base = (void __iomem *)ap->ioaddr.bmdma_addr; -int is_slave = adev->devno; -const u8 xferspeed = adev->dma_mode; - -if (xferspeed >=XFER_UDMA_0 ) -pata_bk3710_setudmamode (base, is_slave, - xferspeed -XFER_UDMA_0 ); -else -pata_bk3710_setmwdmamode (base, is_slave, - adev->id[ATA_ID_EIDE_DMA_MIN ], - xferspeed); -} - -static void pata_bk3710_setpiomode (void __iomem *base,struct ata_device *pair, -unsigned int dev,unsigned int cycletime, -unsigned int mode) -{ -const struct ata_timing *t; -u32 val32; -u8 t2, t2i, t0; - - t =ata_timing_find_mode (XFER_PIO_0 + mode); - -/* PIO Data Setup */ - t0 =DIV_ROUND_UP (cycletime, ideclk_period); - t2 =DIV_ROUND_UP (t->active, ideclk_period); - - t2i = t0 - t2 -1 ; - t2--; - - val32 =ioread32 (base +BK3710_DATSTB ) & (0xFF << (dev ?0 :8 )); - val32 |= t2 << (dev ?8 :0 ); -iowrite32 (val32, base +BK3710_DATSTB ); - - val32 =ioread32 (base +BK3710_DATRCVR ) & (0xFF << (dev ?0 :8 )); - val32 |= t2i << (dev ?8 :0 ); -iowrite32 (val32, base +BK3710_DATRCVR ); - -/* FIXME: this is broken also in the old driver */ -if (pair) { -u8 mode2 = pair->pio_mode -XFER_PIO_0 ; - -if (mode2 < mode) - mode = mode2; - } - -/* TASKFILE Setup */ - t0 =DIV_ROUND_UP (t->cyc8b, ideclk_period); - t2 =DIV_ROUND_UP (t->act8b, ideclk_period); - - t2i = t0 - t2 -1 ; - t2--; - - val32 =ioread32 (base +BK3710_REGSTB ) & (0xFF << (dev ?0 :8 )); - val32 |= t2 << (dev ?8 :0 ); -iowrite32 (val32, base +BK3710_REGSTB ); - - val32 =ioread32 (base +BK3710_REGRCVR ) & (0xFF << (dev ?0 :8 )); - val32 |= t2i << (dev ?8 :0 ); -iowrite32 (val32, base +BK3710_REGRCVR ); -} - -static void pata_bk3710_set_piomode (struct ata_port *ap, -struct ata_device *adev) -{ -void __iomem *base = (void __iomem *)ap->ioaddr.bmdma_addr; -struct ata_device *pair =ata_dev_pair (adev); -const struct ata_timing *t =ata_timing_find_mode (adev->pio_mode); -const u16 *id = adev->id; -unsigned int cycle_time =0 ; -int is_slave = adev->devno; -const u8 pio = adev->pio_mode -XFER_PIO_0 ; - -if (id[ATA_ID_FIELD_VALID ] &2 ) { -if (ata_id_has_iordy (id)) - cycle_time = id[ATA_ID_EIDE_PIO_IORDY ]; -else - cycle_time = id[ATA_ID_EIDE_PIO ]; - -/* conservative "downgrade" for all pre-ATA2 drives */ -if (pio <3 && cycle_time < t->cycle) - cycle_time =0 ;/* use standard timing */ - } - -if (!cycle_time) - cycle_time = t->cycle; - -pata_bk3710_setpiomode (base, pair, is_slave, cycle_time, pio); -} - -static void pata_bk3710_chipinit (void __iomem *base) -{ -/* -* REVISIT: the ATA reset signal needs to be managed through a -* GPIO, which means it should come from platform_data. Until -* we get and use such information, we have to trust that things -* have been reset before we get here. -*/ - -/* -* Program the IDETIMP Register Value based on the following assumptions -* -* (ATA_IDETIMP_IDEEN , ENABLE ) | -* (ATA_IDETIMP_PREPOST1 , DISABLE) | -* (ATA_IDETIMP_PREPOST0 , DISABLE) | -* -* DM6446 silicon rev 2.1 and earlier have no observed net benefit -* from enabling prefetch/postwrite. -*/ -iowrite16 (BIT (15 ), base +BK3710_IDETIMP ); - -/* -* UDMACTL Ultra-ATA DMA Control -* (ATA_UDMACTL_UDMAP1 , 0 ) | -* (ATA_UDMACTL_UDMAP0 , 0 ) -* -*/ -iowrite16 (0 , base +BK3710_UDMACTL ); - -/* -* MISCCTL Miscellaneous Conrol Register -* (ATA_MISCCTL_HWNHLD1P , 1 cycle) -* (ATA_MISCCTL_HWNHLD0P , 1 cycle) -* (ATA_MISCCTL_TIMORIDE , 1) -*/ -iowrite32 (0x001 , base +BK3710_MISCCTL ); - -/* -* IORDYTMP IORDY Timer for Primary Register -* (ATA_IORDYTMP_IORDYTMP , DISABLE) -*/ -iowrite32 (0 , base +BK3710_IORDYTMP ); - -/* -* Configure BMISP Register -* (ATA_BMISP_DMAEN1 , DISABLE ) | -* (ATA_BMISP_DMAEN0 , DISABLE ) | -* (ATA_BMISP_IORDYINT , CLEAR) | -* (ATA_BMISP_INTRSTAT , CLEAR) | -* (ATA_BMISP_DMAERROR , CLEAR) -*/ -iowrite16 (0xE , base +BK3710_BMISP ); - -pata_bk3710_setpiomode (base,NULL ,0 ,600 ,0 ); -pata_bk3710_setpiomode (base,NULL ,1 ,600 ,0 ); -} - -static struct ata_port_operations pata_bk3710_ports_ops = { - .inherits = &ata_bmdma_port_ops, - .cable_detect = ata_cable_80wire, - - .set_piomode = pata_bk3710_set_piomode, - .set_dmamode = pata_bk3710_set_dmamode, -}; - -static int __init pata_bk3710_probe (struct platform_device *pdev) -{ -struct clk *clk; -struct resource *mem; -struct ata_host *host; -struct ata_port *ap; -void __iomem *base; -unsigned long rate; -int irq; - - clk =devm_clk_get (&pdev->dev,NULL ); -if (IS_ERR (clk)) -return -ENODEV ; - -clk_enable (clk); - rate =clk_get_rate (clk); -if (!rate) -return -EINVAL ; - -/* NOTE: round *down* to meet minimum timings; we count in clocks */ - ideclk_period =1000000000UL / rate; - - mem =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - - irq =platform_get_irq (pdev,0 ); -if (irq <0 ) { -pr_err (DRV_NAME ": failed to get IRQ resource\n" ); -return irq; - } - - base =devm_ioremap_resource (&pdev->dev, mem); -if (IS_ERR (base)) -return PTR_ERR (base); - -/* configure the Palmchip controller */ -pata_bk3710_chipinit (base); - -/* allocate host */ - host =ata_host_alloc (&pdev->dev,1 ); -if (!host) -return -ENOMEM ; - ap = host->ports[0 ]; - - ap->ops = &pata_bk3710_ports_ops; - ap->pio_mask =ATA_PIO4 ; - ap->mwdma_mask =ATA_MWDMA2 ; - ap->udma_mask = rate <100000000 ?ATA_UDMA4 :ATA_UDMA5 ; - ap->flags |=ATA_FLAG_SLAVE_POSS ; - - ap->ioaddr.data_addr = base +BK3710_TF_OFFSET ; - ap->ioaddr.error_addr = base +BK3710_TF_OFFSET +1 ; - ap->ioaddr.feature_addr = base +BK3710_TF_OFFSET +1 ; - ap->ioaddr.nsect_addr = base +BK3710_TF_OFFSET +2 ; - ap->ioaddr.lbal_addr = base +BK3710_TF_OFFSET +3 ; - ap->ioaddr.lbam_addr = base +BK3710_TF_OFFSET +4 ; - ap->ioaddr.lbah_addr = base +BK3710_TF_OFFSET +5 ; - ap->ioaddr.device_addr = base +BK3710_TF_OFFSET +6 ; - ap->ioaddr.status_addr = base +BK3710_TF_OFFSET +7 ; - ap->ioaddr.command_addr = base +BK3710_TF_OFFSET +7 ; - - ap->ioaddr.altstatus_addr = base +BK3710_CTL_OFFSET ; - ap->ioaddr.ctl_addr = base +BK3710_CTL_OFFSET ; - - ap->ioaddr.bmdma_addr = base; - -ata_port_desc (ap,"cmd 0x%lx ctl 0x%lx" , - (unsigned long )base +BK3710_TF_OFFSET , - (unsigned long )base +BK3710_CTL_OFFSET ); - -/* activate */ -return ata_host_activate (host, irq, ata_sff_interrupt,0 , - &pata_bk3710_sht); -} - -/* work with hotplug and coldplug */ -MODULE_ALIAS ("platform:palm_bk3710" ); - -static struct platform_driver pata_bk3710_driver = { - .driver = { - .name ="palm_bk3710" , - }, -}; - -static int __init pata_bk3710_init (void ) -{ -return platform_driver_probe (&pata_bk3710_driver, pata_bk3710_probe); -} - -module_init (pata_bk3710_init); -MODULE_LICENSE ("GPL v2" );
Signature · 2 lines
Damien Le Moal Western Digital Research
Re: [PATCH 11/14] pata: remove palmchip bk3710 driver
Quoted 7 lines · Damien Le Moal
Quoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
This device was used only on the davinci dm644x platform that is now gone, and no references to the device remain in the kernel.
Quoted 5 lines
Quoted 1 line
Signed-off-by Arnd Bergmann <[email protected]>Great, one less pata/ide driver !
I can queue this in ata tree. I do have some changes in ataKconfigqueued already, but they should not conflict.
I have two more patches coming today: the palmld and samsung_cf drivers.
You can apply all three as they come in, otherwise I'll just keep them in my tree along with the arch/arm/ boardfile removal.
Arnd
Re: [PATCH 11/14] pata: remove palmchip bk3710 driver
In reply to Arnd BergmannQuoted 3 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
This device was used only on the davinci dm644x platform that
Well, DM646x too but...
Quoted 2 lines
is now gone, and no references to the device remain in the kernel.
... in fact, I'm not seeing davinci_init_ide() called anywhere... :-/
Quoted 1 line
Signed-off-by Arnd Bergmann <[email protected]>
[...]
MBR, Sergey
Re: [PATCH 11/14] pata: remove palmchip bk3710 driver
In reply to Arnd BergmannQuoted 9 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
This device was used only on the davinci dm644x platform that is now gone, and no references to the device remain in the kernel.
Signed-off-by Arnd Bergmann <[email protected]>---
Damien Le Moal
AppliedRe: [PATCH 11/14] pata: remove palmchip bk3710 driver
In reply to Arnd BergmannQuoted 7 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
This device was used only on the davinci dm644x platform that is now gone, and no references to the device remain in the kernel.
Signed-off-by Arnd Bergmann <[email protected]>
Applied to libata tree for-6.2 branch (and for-next). Note that I fixed-up the patch title to:
ata: remove palmchip pata_bk3710 driver
Thanks !
Quoted 426 lines
--- drivers/ata/Kconfig | 10 - drivers/ata/Makefile | 1 - drivers/ata/pata_bk3710.c | 380 -------------------------------------- 3 files changed, 391 deletions(-) delete mode 100644 drivers/ata/pata_bk3710.cdrivers/ata/Kconfig +0
-10@@ -609,16 +609,6 @@ config PATA_ATP867X If unsure, say N. -config PATA_BK3710 - tristate "Palmchip BK3710 PATA support" - depends on ARCH_DAVINCI || COMPILE_TEST - select PATA_TIMINGS - help - This option enables support for the integrated IDE controller on - the TI DaVinci SoC. - - If unsure, say N. - config PATA_CMD64X tristate "CMD64x PATA support" depends on PCIdrivers/ata/Makefile +0
-1@@ -54,7 +54,6 @@ obj-$(CONFIG_PATA_AMD) += pata_amd.o obj-$(CONFIG_PATA_ARTOP) += pata_artop.o obj-$(CONFIG_PATA_ATIIXP) += pata_atiixp.o obj-$(CONFIG_PATA_ATP867X) += pata_atp867x.o -obj-$(CONFIG_PATA_BK3710) += pata_bk3710.o obj-$(CONFIG_PATA_CMD64X) += pata_cmd64x.o obj-$(CONFIG_PATA_CS5520) += pata_cs5520.o obj-$(CONFIG_PATA_CS5530) += pata_cs5530.odrivers/ata/pata_bk3710.c deleted +0
-380@@ -1,380 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 - -/* -* Palmchip BK3710 PATA controller driver -* -* Copyright (c) 2017 Samsung Electronics Co., Ltd. -* http://www.samsung.com -* -* Based on palm_bk3710.c: -* -* Copyright (C) 2006 Texas Instruments. -* Copyright (C) 2007 MontaVista Software, Inc., <[email protected]> -*/ - -#include <linux/ata.h> -#include <linux/clk.h> -#include <linux/delay.h> -#include <linux/init.h> -#include <linux/ioport.h> -#include <linux/kernel.h> -#include <linux/libata.h> -#include <linux/module.h> -#include <linux/platform_device.h> -#include <linux/types.h> - -#define DRV_NAME "pata_bk3710" - -#define BK3710_TF_OFFSET 0x1F0 -#define BK3710_CTL_OFFSET 0x3F6 - -#define BK3710_BMISP 0x02 -#define BK3710_IDETIMP 0x40 -#define BK3710_UDMACTL 0x48 -#define BK3710_MISCCTL 0x50 -#define BK3710_REGSTB 0x54 -#define BK3710_REGRCVR 0x58 -#define BK3710_DATSTB 0x5C -#define BK3710_DATRCVR 0x60 -#define BK3710_DMASTB 0x64 -#define BK3710_DMARCVR 0x68 -#define BK3710_UDMASTB 0x6C -#define BK3710_UDMATRP 0x70 -#define BK3710_UDMAENV 0x74 -#define BK3710_IORDYTMP 0x78 - -static struct scsi_host_template pata_bk3710_sht = { -ATA_BMDMA_SHT (DRV_NAME ), -}; - -static unsigned int ideclk_period;/* in nanoseconds */ - -struct pata_bk3710_udmatiming { -unsigned int rptime;/* tRP -- Ready to pause time (nsec) */ -unsigned int cycletime;/* tCYCTYP2/2 -- avg Cycle Time (nsec) */ -/* tENV is always a minimum of 20 nsec */ -}; - -static const struct pata_bk3710_udmatiming pata_bk3710_udmatimings[6 ] = { - {160 ,240 /2 },/* UDMA Mode 0 */ - {125 ,160 /2 },/* UDMA Mode 1 */ - {100 ,120 /2 },/* UDMA Mode 2 */ - {100 ,90 /2 },/* UDMA Mode 3 */ - {100 ,60 /2 },/* UDMA Mode 4 */ - {85 ,40 /2 },/* UDMA Mode 5 */ -}; - -static void pata_bk3710_setudmamode (void __iomem *base,unsigned int dev, -unsigned int mode) -{ -u32 val32; -u16 val16; -u8 tenv, trp, t0; - -/* DMA Data Setup */ - t0 =DIV_ROUND_UP (pata_bk3710_udmatimings[mode].cycletime, - ideclk_period) -1 ; - tenv =DIV_ROUND_UP (20 , ideclk_period) -1 ; - trp =DIV_ROUND_UP (pata_bk3710_udmatimings[mode].rptime, - ideclk_period) -1 ; - -/* udmastb Ultra DMA Access Strobe Width */ - val32 =ioread32 (base +BK3710_UDMASTB ) & (0xFF << (dev ?0 :8 )); - val32 |= t0 << (dev ?8 :0 ); -iowrite32 (val32, base +BK3710_UDMASTB ); - -/* udmatrp Ultra DMA Ready to Pause Time */ - val32 =ioread32 (base +BK3710_UDMATRP ) & (0xFF << (dev ?0 :8 )); - val32 |= trp << (dev ?8 :0 ); -iowrite32 (val32, base +BK3710_UDMATRP ); - -/* udmaenv Ultra DMA envelop Time */ - val32 =ioread32 (base +BK3710_UDMAENV ) & (0xFF << (dev ?0 :8 )); - val32 |= tenv << (dev ?8 :0 ); -iowrite32 (val32, base +BK3710_UDMAENV ); - -/* Enable UDMA for Device */ - val16 =ioread16 (base +BK3710_UDMACTL ) | (1 << dev); -iowrite16 (val16, base +BK3710_UDMACTL ); -} - -static void pata_bk3710_setmwdmamode (void __iomem *base,unsigned int dev, -unsigned short min_cycle, -unsigned int mode) -{ -const struct ata_timing *t; -int cycletime; -u32 val32; -u16 val16; -u8 td, tkw, t0; - - t =ata_timing_find_mode (mode); - cycletime =max_t (int, t->cycle, min_cycle); - -/* DMA Data Setup */ - t0 =DIV_ROUND_UP (cycletime, ideclk_period); - td =DIV_ROUND_UP (t->active, ideclk_period); - tkw = t0 - td -1 ; - td--; - - val32 =ioread32 (base +BK3710_DMASTB ) & (0xFF << (dev ?0 :8 )); - val32 |= td << (dev ?8 :0 ); -iowrite32 (val32, base +BK3710_DMASTB ); - - val32 =ioread32 (base +BK3710_DMARCVR ) & (0xFF << (dev ?0 :8 )); - val32 |= tkw << (dev ?8 :0 ); -iowrite32 (val32, base +BK3710_DMARCVR ); - -/* Disable UDMA for Device */ - val16 =ioread16 (base +BK3710_UDMACTL ) & ~(1 << dev); -iowrite16 (val16, base +BK3710_UDMACTL ); -} - -static void pata_bk3710_set_dmamode (struct ata_port *ap, -struct ata_device *adev) -{ -void __iomem *base = (void __iomem *)ap->ioaddr.bmdma_addr; -int is_slave = adev->devno; -const u8 xferspeed = adev->dma_mode; - -if (xferspeed >=XFER_UDMA_0 ) -pata_bk3710_setudmamode (base, is_slave, - xferspeed -XFER_UDMA_0 ); -else -pata_bk3710_setmwdmamode (base, is_slave, - adev->id[ATA_ID_EIDE_DMA_MIN ], - xferspeed); -} - -static void pata_bk3710_setpiomode (void __iomem *base,struct ata_device *pair, -unsigned int dev,unsigned int cycletime, -unsigned int mode) -{ -const struct ata_timing *t; -u32 val32; -u8 t2, t2i, t0; - - t =ata_timing_find_mode (XFER_PIO_0 + mode); - -/* PIO Data Setup */ - t0 =DIV_ROUND_UP (cycletime, ideclk_period); - t2 =DIV_ROUND_UP (t->active, ideclk_period); - - t2i = t0 - t2 -1 ; - t2--; - - val32 =ioread32 (base +BK3710_DATSTB ) & (0xFF << (dev ?0 :8 )); - val32 |= t2 << (dev ?8 :0 ); -iowrite32 (val32, base +BK3710_DATSTB ); - - val32 =ioread32 (base +BK3710_DATRCVR ) & (0xFF << (dev ?0 :8 )); - val32 |= t2i << (dev ?8 :0 ); -iowrite32 (val32, base +BK3710_DATRCVR ); - -/* FIXME: this is broken also in the old driver */ -if (pair) { -u8 mode2 = pair->pio_mode -XFER_PIO_0 ; - -if (mode2 < mode) - mode = mode2; - } - -/* TASKFILE Setup */ - t0 =DIV_ROUND_UP (t->cyc8b, ideclk_period); - t2 =DIV_ROUND_UP (t->act8b, ideclk_period); - - t2i = t0 - t2 -1 ; - t2--; - - val32 =ioread32 (base +BK3710_REGSTB ) & (0xFF << (dev ?0 :8 )); - val32 |= t2 << (dev ?8 :0 ); -iowrite32 (val32, base +BK3710_REGSTB ); - - val32 =ioread32 (base +BK3710_REGRCVR ) & (0xFF << (dev ?0 :8 )); - val32 |= t2i << (dev ?8 :0 ); -iowrite32 (val32, base +BK3710_REGRCVR ); -} - -static void pata_bk3710_set_piomode (struct ata_port *ap, -struct ata_device *adev) -{ -void __iomem *base = (void __iomem *)ap->ioaddr.bmdma_addr; -struct ata_device *pair =ata_dev_pair (adev); -const struct ata_timing *t =ata_timing_find_mode (adev->pio_mode); -const u16 *id = adev->id; -unsigned int cycle_time =0 ; -int is_slave = adev->devno; -const u8 pio = adev->pio_mode -XFER_PIO_0 ; - -if (id[ATA_ID_FIELD_VALID ] &2 ) { -if (ata_id_has_iordy (id)) - cycle_time = id[ATA_ID_EIDE_PIO_IORDY ]; -else - cycle_time = id[ATA_ID_EIDE_PIO ]; - -/* conservative "downgrade" for all pre-ATA2 drives */ -if (pio <3 && cycle_time < t->cycle) - cycle_time =0 ;/* use standard timing */ - } - -if (!cycle_time) - cycle_time = t->cycle; - -pata_bk3710_setpiomode (base, pair, is_slave, cycle_time, pio); -} - -static void pata_bk3710_chipinit (void __iomem *base) -{ -/* -* REVISIT: the ATA reset signal needs to be managed through a -* GPIO, which means it should come from platform_data. Until -* we get and use such information, we have to trust that things -* have been reset before we get here. -*/ - -/* -* Program the IDETIMP Register Value based on the following assumptions -* -* (ATA_IDETIMP_IDEEN , ENABLE ) | -* (ATA_IDETIMP_PREPOST1 , DISABLE) | -* (ATA_IDETIMP_PREPOST0 , DISABLE) | -* -* DM6446 silicon rev 2.1 and earlier have no observed net benefit -* from enabling prefetch/postwrite. -*/ -iowrite16 (BIT (15 ), base +BK3710_IDETIMP ); - -/* -* UDMACTL Ultra-ATA DMA Control -* (ATA_UDMACTL_UDMAP1 , 0 ) | -* (ATA_UDMACTL_UDMAP0 , 0 ) -* -*/ -iowrite16 (0 , base +BK3710_UDMACTL ); - -/* -* MISCCTL Miscellaneous Conrol Register -* (ATA_MISCCTL_HWNHLD1P , 1 cycle) -* (ATA_MISCCTL_HWNHLD0P , 1 cycle) -* (ATA_MISCCTL_TIMORIDE , 1) -*/ -iowrite32 (0x001 , base +BK3710_MISCCTL ); - -/* -* IORDYTMP IORDY Timer for Primary Register -* (ATA_IORDYTMP_IORDYTMP , DISABLE) -*/ -iowrite32 (0 , base +BK3710_IORDYTMP ); - -/* -* Configure BMISP Register -* (ATA_BMISP_DMAEN1 , DISABLE ) | -* (ATA_BMISP_DMAEN0 , DISABLE ) | -* (ATA_BMISP_IORDYINT , CLEAR) | -* (ATA_BMISP_INTRSTAT , CLEAR) | -* (ATA_BMISP_DMAERROR , CLEAR) -*/ -iowrite16 (0xE , base +BK3710_BMISP ); - -pata_bk3710_setpiomode (base,NULL ,0 ,600 ,0 ); -pata_bk3710_setpiomode (base,NULL ,1 ,600 ,0 ); -} - -static struct ata_port_operations pata_bk3710_ports_ops = { - .inherits = &ata_bmdma_port_ops, - .cable_detect = ata_cable_80wire, - - .set_piomode = pata_bk3710_set_piomode, - .set_dmamode = pata_bk3710_set_dmamode, -}; - -static int __init pata_bk3710_probe (struct platform_device *pdev) -{ -struct clk *clk; -struct resource *mem; -struct ata_host *host; -struct ata_port *ap; -void __iomem *base; -unsigned long rate; -int irq; - - clk =devm_clk_get (&pdev->dev,NULL ); -if (IS_ERR (clk)) -return -ENODEV ; - -clk_enable (clk); - rate =clk_get_rate (clk); -if (!rate) -return -EINVAL ; - -/* NOTE: round *down* to meet minimum timings; we count in clocks */ - ideclk_period =1000000000UL / rate; - - mem =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - - irq =platform_get_irq (pdev,0 ); -if (irq <0 ) { -pr_err (DRV_NAME ": failed to get IRQ resource\n" ); -return irq; - } - - base =devm_ioremap_resource (&pdev->dev, mem); -if (IS_ERR (base)) -return PTR_ERR (base); - -/* configure the Palmchip controller */ -pata_bk3710_chipinit (base); - -/* allocate host */ - host =ata_host_alloc (&pdev->dev,1 ); -if (!host) -return -ENOMEM ; - ap = host->ports[0 ]; - - ap->ops = &pata_bk3710_ports_ops; - ap->pio_mask =ATA_PIO4 ; - ap->mwdma_mask =ATA_MWDMA2 ; - ap->udma_mask = rate <100000000 ?ATA_UDMA4 :ATA_UDMA5 ; - ap->flags |=ATA_FLAG_SLAVE_POSS ; - - ap->ioaddr.data_addr = base +BK3710_TF_OFFSET ; - ap->ioaddr.error_addr = base +BK3710_TF_OFFSET +1 ; - ap->ioaddr.feature_addr = base +BK3710_TF_OFFSET +1 ; - ap->ioaddr.nsect_addr = base +BK3710_TF_OFFSET +2 ; - ap->ioaddr.lbal_addr = base +BK3710_TF_OFFSET +3 ; - ap->ioaddr.lbam_addr = base +BK3710_TF_OFFSET +4 ; - ap->ioaddr.lbah_addr = base +BK3710_TF_OFFSET +5 ; - ap->ioaddr.device_addr = base +BK3710_TF_OFFSET +6 ; - ap->ioaddr.status_addr = base +BK3710_TF_OFFSET +7 ; - ap->ioaddr.command_addr = base +BK3710_TF_OFFSET +7 ; - - ap->ioaddr.altstatus_addr = base +BK3710_CTL_OFFSET ; - ap->ioaddr.ctl_addr = base +BK3710_CTL_OFFSET ; - - ap->ioaddr.bmdma_addr = base; - -ata_port_desc (ap,"cmd 0x%lx ctl 0x%lx" , - (unsigned long )base +BK3710_TF_OFFSET , - (unsigned long )base +BK3710_CTL_OFFSET ); - -/* activate */ -return ata_host_activate (host, irq, ata_sff_interrupt,0 , - &pata_bk3710_sht); -} - -/* work with hotplug and coldplug */ -MODULE_ALIAS ("platform:palm_bk3710" ); - -static struct platform_driver pata_bk3710_driver = { - .driver = { - .name ="palm_bk3710" , - }, -}; - -static int __init pata_bk3710_init (void ) -{ -return platform_driver_probe (&pata_bk3710_driver, pata_bk3710_probe); -} - -module_init (pata_bk3710_init); -MODULE_LICENSE ("GPL v2" );
Signature · 2 lines
Damien Le Moal Western Digital Research
PATCH 12/14 irqchip: remove davinci aintc driver
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The aintc driver was used on Davinci DM3xx and DM64xx SoCs, all of which got dropped from Linux, so this driver is orphaned as well.
--- drivers/irqchip/Kconfig | 5 - drivers/irqchip/Makefile | 1 - drivers/irqchip/irq-davinci-aintc.c | 163 ---------------------------- 3 files changed, 169 deletions(-) delete mode 100644 drivers/irqchip/irq-davinci-aintc.c
drivers/irqchip/Kconfig +0 -5
@@ -136,11 +136,6 @@ config BRCMSTB_L2_IRQ select GENERIC_IRQ_CHIP select IRQ_DOMAIN -config DAVINCI_AINTC - bool - select GENERIC_IRQ_CHIP - select IRQ_DOMAIN - config DAVINCI_CP_INTC bool select GENERIC_IRQ_CHIP
drivers/irqchip/Makefile +0 -1
@@ -8,7 +8,6 @@ obj-$(CONFIG_ATH79) += irq-ath79-misc.o obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2836.o obj-$(CONFIG_ARCH_ACTIONS) += irq-owl-sirq.o -obj-$(CONFIG_DAVINCI_AINTC) += irq-davinci-aintc.o obj-$(CONFIG_DAVINCI_CP_INTC) += irq-davinci-cp-intc.o obj-$(CONFIG_EXYNOS_IRQ_COMBINER) += exynos-combiner.o obj-$(CONFIG_FARADAY_FTINTC010) += irq-ftintc010.o
drivers/irqchip/irq-davinci-aintc.c deleted +0 -163
163 lines not on this page · raw message
Signature · 1 line
2.29.2
Re: [PATCH 12/14] irqchip: remove davinci aintc driver
Quoted 8 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The aintc driver was used on Davinci DM3xx and DM64xx SoCs, all of which got dropped from Linux, so this driver is orphaned as well.
Signed-off-by Arnd Bergmann <[email protected]>---
PATCH 13/14 staging: media: remove davinci vpfe_capture driver
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
This driver was for the davinci dm644x and dm3xx platforms that are now removed from the kernel, so there are no more users.
--- MAINTAINERS | 1 - drivers/staging/media/Kconfig | 1 - drivers/staging/media/Makefile | 1 - .../media/deprecated/vpfe_capture/Kconfig | 58 - .../media/deprecated/vpfe_capture/Makefile | 4 - .../media/deprecated/vpfe_capture/TODO | 7 - .../deprecated/vpfe_capture/ccdc_hw_device.h | 80 - .../deprecated/vpfe_capture/dm355_ccdc.c | 934 -------- .../deprecated/vpfe_capture/dm355_ccdc.h | 308 --- .../deprecated/vpfe_capture/dm355_ccdc_regs.h | 297 --- .../deprecated/vpfe_capture/dm644x_ccdc.c | 879 -------- .../deprecated/vpfe_capture/dm644x_ccdc.h | 171 -- .../vpfe_capture/dm644x_ccdc_regs.h | 140 -- .../media/deprecated/vpfe_capture/isif.c | 1127 ---------- .../media/deprecated/vpfe_capture/isif.h | 518 ----- .../media/deprecated/vpfe_capture/isif_regs.h | 256 --- .../deprecated/vpfe_capture/vpfe_capture.c | 1902 ----------------- include/media/davinci/vpfe_capture.h | 177 -- 18 files changed, 6861 deletions(-) delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/Kconfig delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/Makefile delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/TODO delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/ccdc_hw_device.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc.c delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc_regs.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc.c delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc_regs.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/isif.c delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/isif.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/isif_regs.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/vpfe_capture.c delete mode 100644 include/media/davinci/vpfe_capture.h
MAINTAINERS +0 -1
@@ -20491,7 +20491,6 @@ W: https://linuxtv.org Q: http://patchwork.linuxtv.org/project/linux-media/list/ T: git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git F: drivers/media/platform/ti/davinci/ -F: drivers/staging/media/deprecated/vpfe_capture/ F: include/media/davinci/ TI ENHANCED CAPTURE (eCAP) DRIVER
drivers/staging/media/Kconfig +0 -1
@@ -57,7 +57,6 @@ source "drivers/staging/media/deprecated/meye/Kconfig" source "drivers/staging/media/deprecated/saa7146/Kconfig" source "drivers/staging/media/deprecated/stkwebcam/Kconfig" source "drivers/staging/media/deprecated/tm6000/Kconfig" -source "drivers/staging/media/deprecated/vpfe_capture/Kconfig" source "drivers/staging/media/deprecated/zr364xx/Kconfig" endif
drivers/staging/media/Makefile +0 -1
@@ -14,5 +14,4 @@ obj-$(CONFIG_VIDEO_IPU3_IMGU) += ipu3/ obj-$(CONFIG_VIDEO_TM6000) += deprecated/tm6000/ obj-$(CONFIG_VIDEO_VIU) += deprecated/fsl-viu/ obj-$(CONFIG_USB_ZR364XX) += deprecated/zr364xx/ -obj-y += deprecated/vpfe_capture/ obj-y += deprecated/saa7146/
drivers/staging/media/deprecated/vpfe_capture/Kconfig deleted +0 -58
58 lines not on this page · raw message
drivers/staging/media/deprecated/vpfe_capture/Makefile deleted +0 -4
@@ -1,4 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_VIDEO_DM6446_CCDC) += vpfe_capture.o dm644x_ccdc.o -obj-$(CONFIG_VIDEO_DM355_CCDC) += vpfe_capture.o dm355_ccdc.o -obj-$(CONFIG_VIDEO_DM365_ISIF) += vpfe_capture.o isif.o
drivers/staging/media/deprecated/vpfe_capture/TODO deleted +0 -7
@@ -1,7 +0,0 @@ -These are one of the few drivers still not using the vb2 -framework, so these drivers are now deprecated with the intent of -removing them altogether by the beginning of 2023. - -In order to keep these drivers they have to be converted to vb2. -If someone is interested in doing this work, then contact the -linux-media mailinglist (https://linuxtv.org/lists.php).
drivers/staging/media/deprecated/vpfe_capture/ccdc_hw_device.h deleted +0 -80
80 lines not on this page · raw message
drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc.c deleted +0 -934
934 lines not on this page · raw message
drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc.h deleted +0 -308
308 lines not on this page · raw message
drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc_regs.h deleted +0 -297
297 lines not on this page · raw message
drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc.c deleted +0 -879
879 lines not on this page · raw message
drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc.h deleted +0 -171
171 lines not on this page · raw message
drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc_regs.h deleted +0 -140
140 lines not on this page · raw message
drivers/staging/media/deprecated/vpfe_capture/isif.c deleted +0 -1127
103 lines not on this page · raw message
drivers/staging/media/deprecated/vpfe_capture/isif.h deleted +0 -518
518 lines not on this page · raw message
drivers/staging/media/deprecated/vpfe_capture/isif_regs.h deleted +0 -256
256 lines not on this page · raw message
drivers/staging/media/deprecated/vpfe_capture/vpfe_capture.c deleted +0 -1902
1,902 lines not on this page · raw message
include/media/davinci/vpfe_capture.h deleted +0 -177
177 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.29.2
Part of the diff is not shown here. View the raw message.
Re: [PATCH 13/14] staging: media: remove davinci vpfe_capture driver
Quoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
This driver was for the davinci dm644x and dm3xx platforms that are now removed from the kernel, so there are no more users.
Signed-off-by Arnd Bergmann <[email protected]>
Re: [PATCH 13/14] staging: media: remove davinci vpfe_capture driver
In reply to Arnd BergmannHi Arnd,
Quoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
This driver was for the davinci dm644x and dm3xx platforms that are now removed from the kernel, so there are no more users.
Signed-off-by Arnd Bergmann <[email protected]>
As discussed on irc, it is best if you merge this to due dependencies on arch/arm/mach-davinci/davinci.h.
Note that there is one more reference to vpfe_capture.h:
Documentation/userspace-api/ioctl/ioctl-number.rst:'V' C0 media/davinci/vpfe_capture.h conflict!
Feel free to fold that in this patch, or make a separate patch removing it. If you make a separate patch, then you can add my Acked-by for that change.
Regards,
Hans
Re: [PATCH 13/14] staging: media: remove davinci vpfe_capture driver
In reply to Arnd BergmannOn Wed, Oct 19, 2022 at 4:40 PM Arnd Bergmann <[email protected]> wrote:>
Quoted 33 lines
From: Arnd Bergmann <[email protected]>
This driver was for the davinci dm644x and dm3xx platforms that are now removed from the kernel, so there are no more users.
Signed-off-by Arnd Bergmann <[email protected]>--- MAINTAINERS | 1 - drivers/staging/media/Kconfig | 1 - drivers/staging/media/Makefile | 1 - .../media/deprecated/vpfe_capture/Kconfig | 58 - .../media/deprecated/vpfe_capture/Makefile | 4 - .../media/deprecated/vpfe_capture/TODO | 7 - .../deprecated/vpfe_capture/ccdc_hw_device.h | 80 - .../deprecated/vpfe_capture/dm355_ccdc.c | 934 -------- .../deprecated/vpfe_capture/dm355_ccdc.h | 308 --- .../deprecated/vpfe_capture/dm355_ccdc_regs.h | 297 --- .../deprecated/vpfe_capture/dm644x_ccdc.c | 879 -------- .../deprecated/vpfe_capture/dm644x_ccdc.h | 171 -- .../vpfe_capture/dm644x_ccdc_regs.h | 140 -- .../media/deprecated/vpfe_capture/isif.c | 1127 ---------- .../media/deprecated/vpfe_capture/isif.h | 518 ----- .../media/deprecated/vpfe_capture/isif_regs.h | 256 --- .../deprecated/vpfe_capture/vpfe_capture.c | 1902 ----------------- include/media/davinci/vpfe_capture.h | 177 -- 18 files changed, 6861 deletions(-) delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/Kconfig delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/Makefile delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/TODO delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/ccdc_hw_device.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc.c delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc_regs.h
Quoted 9 lines
delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc.c delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc_regs.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/isif.c delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/isif.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/isif_regs.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/vpfe_capture.c delete mode 100644 include/media/davinci/vpfe_capture.h
Cheers,
Prabhakar
PATCH 14/14 media: davinci: remove vpbe support
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The davinci dm3xx/dm644x platforms are gone now, and the remaining da8xx platforms do not use the vpbe driver, so the driver can be removed as well.
--- .../admin-guide/media/davinci-vpbe.rst | 65 - .../admin-guide/media/platform-cardlist.rst | 1 - .../admin-guide/media/v4l-drivers.rst | 1 - .../media/drivers/davinci-vpbe-devel.rst | 39 - .../driver-api/media/drivers/index.rst | 1 - drivers/media/platform/ti/davinci/Kconfig | 16 - drivers/media/platform/ti/davinci/Makefile | 3 - drivers/media/platform/ti/davinci/vpbe.c | 840 --------- .../media/platform/ti/davinci/vpbe_display.c | 1510 ---------------- drivers/media/platform/ti/davinci/vpbe_osd.c | 1582 ----------------- .../media/platform/ti/davinci/vpbe_osd_regs.h | 352 ---- drivers/media/platform/ti/davinci/vpbe_venc.c | 676 ------- .../platform/ti/davinci/vpbe_venc_regs.h | 165 -- drivers/media/platform/ti/davinci/vpss.c | 529 ------ include/media/davinci/vpbe.h | 184 -- include/media/davinci/vpbe_display.h | 122 -- include/media/davinci/vpbe_osd.h | 382 ---- include/media/davinci/vpbe_types.h | 74 - include/media/davinci/vpbe_venc.h | 37 - include/media/davinci/vpss.h | 111 -- 20 files changed, 6690 deletions(-) delete mode 100644 Documentation/admin-guide/media/davinci-vpbe.rst delete mode 100644 Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst delete mode 100644 drivers/media/platform/ti/davinci/vpbe.c delete mode 100644 drivers/media/platform/ti/davinci/vpbe_display.c delete mode 100644 drivers/media/platform/ti/davinci/vpbe_osd.c delete mode 100644 drivers/media/platform/ti/davinci/vpbe_osd_regs.h delete mode 100644 drivers/media/platform/ti/davinci/vpbe_venc.c delete mode 100644 drivers/media/platform/ti/davinci/vpbe_venc_regs.h delete mode 100644 drivers/media/platform/ti/davinci/vpss.c delete mode 100644 include/media/davinci/vpbe.h delete mode 100644 include/media/davinci/vpbe_display.h delete mode 100644 include/media/davinci/vpbe_osd.h delete mode 100644 include/media/davinci/vpbe_types.h delete mode 100644 include/media/davinci/vpbe_venc.h delete mode 100644 include/media/davinci/vpss.h
Documentation/admin-guide/media/davinci-vpbe.rst deleted +0 -65
@@ -1,65 +0,0 @@ -.. SPDX-License-Identifier: GPL-2.0 - -The VPBE V4L2 driver design -=========================== - -Functional partitioning ------------------------ - -Consists of the following: - - 1. V4L2 display driver - - Implements creation of video2 and video3 device nodes and - provides v4l2 device interface to manage VID0 and VID1 layers. - - 2. Display controller - - Loads up VENC, OSD and external encoders such as ths8200. It provides - a set of API calls to V4L2 drivers to set the output/standards - in the VENC or external sub devices. It also provides - a device object to access the services from OSD subdevice - using sub device ops. The connection of external encoders to VENC LCD - controller port is done at init time based on default output and standard - selection or at run time when application change the output through - V4L2 IOCTLs. - - When connected to an external encoder, vpbe controller is also responsible - for setting up the interface between VENC and external encoders based on - board specific settings (specified in board-xxx-evm.c). This allows - interfacing external encoders such as ths8200. The setup_if_config() - is implemented for this as well as configure_venc() (part of the next patch) - API to set timings in VENC for a specific display resolution. As of this - patch series, the interconnection and enabling and setting of the external - encoders is not present, and would be a part of the next patch series. - - 3. VENC subdevice module - - Responsible for setting outputs provided through internal DACs and also - setting timings at LCD controller port when external encoders are connected - at the port or LCD panel timings required. When external encoder/LCD panel - is connected, the timings for a specific standard/preset is retrieved from - the board specific table and the values are used to set the timings in - venc using non-standard timing mode. - - Support LCD Panel displays using the VENC. For example to support a Logic - PD display, it requires setting up the LCD controller port with a set of - timings for the resolution supported and setting the dot clock. So we could - add the available outputs as a board specific entry (i.e add the "LogicPD" - output name to board-xxx-evm.c). A table of timings for various LCDs - supported can be maintained in the board specific setup file to support - various LCD displays.As of this patch a basic driver is present, and this - support for external encoders and displays forms a part of the next - patch series. - - 4. OSD module - - OSD module implements all OSD layer management and hardware specific - features. The VPBE module interacts with the OSD for enabling and - disabling appropriate features of the OSD. - -Current status --------------- - -A fully functional working version of the V4L2 driver is available. This -driver has been tested with NTSC and PAL standards and buffer streaming.
Documentation/admin-guide/media/platform-cardlist.rst +0 -1
@@ -73,7 +73,6 @@ via-camera VIAFB camera controller video-mux Video Multiplexer vpif_display TI DaVinci VPIF V4L2-Display vpif_capture TI DaVinci VPIF video capture -vpss TI DaVinci VPBE V4L2-Display vsp1 Renesas VSP1 Video Processing Engine xilinx-tpg Xilinx Video Test Pattern Generator xilinx-video Xilinx Video IP (EXPERIMENTAL)
Documentation/admin-guide/media/v4l-drivers.rst +0 -1
@@ -13,7 +13,6 @@ Video4Linux (V4L) driver-specific documentation cafe_ccic cpia2 cx88 - davinci-vpbe fimc imx imx7
Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst deleted +0 -39
@@ -1,39 +0,0 @@ -.. SPDX-License-Identifier: GPL-2.0 - -The VPBE V4L2 driver design -=========================== - -File partitioning ------------------ - - V4L2 display device driver - drivers/media/platform/ti/davinci/vpbe_display.c - drivers/media/platform/ti/davinci/vpbe_display.h - - VPBE display controller - drivers/media/platform/ti/davinci/vpbe.c - drivers/media/platform/ti/davinci/vpbe.h - - VPBE venc sub device driver - drivers/media/platform/ti/davinci/vpbe_venc.c - drivers/media/platform/ti/davinci/vpbe_venc.h - drivers/media/platform/ti/davinci/vpbe_venc_regs.h - - VPBE osd driver - drivers/media/platform/ti/davinci/vpbe_osd.c - drivers/media/platform/ti/davinci/vpbe_osd.h - drivers/media/platform/ti/davinci/vpbe_osd_regs.h - -To be done ----------- - -vpbe display controller - - Add support for external encoders. - - add support for selecting external encoder as default at probe time. - -vpbe venc sub device - - add timings for supporting ths8200 - - add support for LogicPD LCD. - -FB drivers - - Add support for fbdev drivers.- Ready and part of subsequent patches.
Documentation/driver-api/media/drivers/index.rst +0 -1
@@ -16,7 +16,6 @@ Video4Linux (V4L) drivers cpia2_devel cx2341x-devel cx88-devel - davinci-vpbe-devel fimc-devel pvrusb2 pxa_camera
drivers/media/platform/ti/davinci/Kconfig +0 -16
@@ -31,19 +31,3 @@ config VIDEO_DAVINCI_VPIF_CAPTURE To compile this driver as a module, choose M here. There will be two modules called vpif.ko and vpif_capture.ko - -config VIDEO_DAVINCI_VPBE_DISPLAY - tristate "TI DaVinci VPBE V4L2-Display driver" - depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_DEV - depends on ARCH_DAVINCI || COMPILE_TEST - depends on I2C - select VIDEOBUF2_DMA_CONTIG - help - Enables Davinci VPBE module used for display devices. - This module is used for display on TI DM644x/DM365/DM355 - based display devices. - - To compile this driver as a module, choose M here. There will - be five modules created called vpss.ko, vpbe.ko, vpbe_osd.ko, - vpbe_venc.ko and vpbe_display.ko
drivers/media/platform/ti/davinci/Makefile +0 -3
@@ -7,6 +7,3 @@ obj-$(CONFIG_VIDEO_DAVINCI_VPIF_DISPLAY) += vpif.o vpif_display.o #VPIF Capture driver obj-$(CONFIG_VIDEO_DAVINCI_VPIF_CAPTURE) += vpif.o vpif_capture.o - -obj-$(CONFIG_VIDEO_DAVINCI_VPBE_DISPLAY) += vpss.o vpbe.o vpbe_osd.o \ - vpbe_venc.o vpbe_display.o
drivers/media/platform/ti/davinci/vpbe.c deleted +0 -840
840 lines not on this page · raw message
drivers/media/platform/ti/davinci/vpbe_display.c deleted +0 -1510
1,510 lines not on this page · raw message
drivers/media/platform/ti/davinci/vpbe_osd.c deleted +0 -1582
500 lines not on this page · raw message
drivers/media/platform/ti/davinci/vpbe_osd_regs.h deleted +0 -352
352 lines not on this page · raw message
drivers/media/platform/ti/davinci/vpbe_venc.c deleted +0 -676
676 lines not on this page · raw message
drivers/media/platform/ti/davinci/vpbe_venc_regs.h deleted +0 -165
165 lines not on this page · raw message
drivers/media/platform/ti/davinci/vpss.c deleted +0 -529
529 lines not on this page · raw message
include/media/davinci/vpbe.h deleted +0 -184
184 lines not on this page · raw message
include/media/davinci/vpbe_display.h deleted +0 -122
122 lines not on this page · raw message
include/media/davinci/vpbe_osd.h deleted +0 -382
382 lines not on this page · raw message
include/media/davinci/vpbe_types.h deleted +0 -74
74 lines not on this page · raw message
include/media/davinci/vpbe_venc.h deleted +0 -37
Lines of this file are not shown. View the raw message.
include/media/davinci/vpss.h deleted +0 -111
111 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.29.2
Part of the diff is not shown here. View the raw message.
Re: [PATCH 14/14] media: davinci: remove vpbe support
Hi Arnd,
Quoted 7 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The davinci dm3xx/dm644x platforms are gone now, and the remaining da8xx platforms do not use the vpbe driver, so the driver can be removed as well.
Signed-off-by Arnd Bergmann <[email protected]>
As discussed on irc, it is best if you merge this to due dependencies on arch/arm/mach-davinci/davinci.h.
Regards,
Hans
Quoted 6,867 lines
--- .../admin-guide/media/davinci-vpbe.rst | 65 - .../admin-guide/media/platform-cardlist.rst | 1 - .../admin-guide/media/v4l-drivers.rst | 1 - .../media/drivers/davinci-vpbe-devel.rst | 39 - .../driver-api/media/drivers/index.rst | 1 - drivers/media/platform/ti/davinci/Kconfig | 16 - drivers/media/platform/ti/davinci/Makefile | 3 - drivers/media/platform/ti/davinci/vpbe.c | 840 --------- .../media/platform/ti/davinci/vpbe_display.c | 1510 ---------------- drivers/media/platform/ti/davinci/vpbe_osd.c | 1582 ----------------- .../media/platform/ti/davinci/vpbe_osd_regs.h | 352 ---- drivers/media/platform/ti/davinci/vpbe_venc.c | 676 ------- .../platform/ti/davinci/vpbe_venc_regs.h | 165 -- drivers/media/platform/ti/davinci/vpss.c | 529 ------ include/media/davinci/vpbe.h | 184 -- include/media/davinci/vpbe_display.h | 122 -- include/media/davinci/vpbe_osd.h | 382 ---- include/media/davinci/vpbe_types.h | 74 - include/media/davinci/vpbe_venc.h | 37 - include/media/davinci/vpss.h | 111 -- 20 files changed, 6690 deletions(-) delete mode 100644 Documentation/admin-guide/media/davinci-vpbe.rst delete mode 100644 Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst delete mode 100644 drivers/media/platform/ti/davinci/vpbe.c delete mode 100644 drivers/media/platform/ti/davinci/vpbe_display.c delete mode 100644 drivers/media/platform/ti/davinci/vpbe_osd.c delete mode 100644 drivers/media/platform/ti/davinci/vpbe_osd_regs.h delete mode 100644 drivers/media/platform/ti/davinci/vpbe_venc.c delete mode 100644 drivers/media/platform/ti/davinci/vpbe_venc_regs.h delete mode 100644 drivers/media/platform/ti/davinci/vpss.c delete mode 100644 include/media/davinci/vpbe.h delete mode 100644 include/media/davinci/vpbe_display.h delete mode 100644 include/media/davinci/vpbe_osd.h delete mode 100644 include/media/davinci/vpbe_types.h delete mode 100644 include/media/davinci/vpbe_venc.h delete mode 100644 include/media/davinci/vpss.hDocumentation/admin-guide/media/davinci-vpbe.rst deleted +0
-65@@ -1,65 +0,0 @@ -.. SPDX-License-Identifier: GPL-2.0 - -The VPBE V4L2 driver design -=========================== - -Functional partitioning ------------------------ - -Consists of the following: - - 1. V4L2 display driver - - Implements creation of video2 and video3 device nodes and - provides v4l2 device interface to manage VID0 and VID1 layers. - - 2. Display controller - - Loads up VENC, OSD and external encoders such as ths8200. It provides - a set of API calls to V4L2 drivers to set the output/standards - in the VENC or external sub devices. It also provides - a device object to access the services from OSD subdevice - using sub device ops. The connection of external encoders to VENC LCD - controller port is done at init time based on default output and standard - selection or at run time when application change the output through - V4L2 IOCTLs. - - When connected to an external encoder, vpbe controller is also responsible - for setting up the interface between VENC and external encoders based on - board specific settings (specified in board-xxx-evm.c). This allows - interfacing external encoders such as ths8200. The setup_if_config() - is implemented for this as well as configure_venc() (part of the next patch) - API to set timings in VENC for a specific display resolution. As of this - patch series, the interconnection and enabling and setting of the external - encoders is not present, and would be a part of the next patch series. - - 3. VENC subdevice module - - Responsible for setting outputs provided through internal DACs and also - setting timings at LCD controller port when external encoders are connected - at the port or LCD panel timings required. When external encoder/LCD panel - is connected, the timings for a specific standard/preset is retrieved from - the board specific table and the values are used to set the timings in - venc using non-standard timing mode. - - Support LCD Panel displays using the VENC. For example to support a Logic - PD display, it requires setting up the LCD controller port with a set of - timings for the resolution supported and setting the dot clock. So we could - add the available outputs as a board specific entry (i.e add the "LogicPD" - output name to board-xxx-evm.c). A table of timings for various LCDs - supported can be maintained in the board specific setup file to support - various LCD displays.As of this patch a basic driver is present, and this - support for external encoders and displays forms a part of the next - patch series. - - 4. OSD module - - OSD module implements all OSD layer management and hardware specific - features. The VPBE module interacts with the OSD for enabling and - disabling appropriate features of the OSD. - -Current status --------------- - -A fully functional working version of the V4L2 driver is available. This -driver has been tested with NTSC and PAL standards and buffer streaming.Documentation/admin-guide/media/platform-cardlist.rst +0
-1@@ -73,7 +73,6 @@ via-camera VIAFB camera controller video-mux Video Multiplexer vpif_display TI DaVinci VPIF V4L2-Display vpif_capture TI DaVinci VPIF video capture -vpss TI DaVinci VPBE V4L2-Display vsp1 Renesas VSP1 Video Processing Engine xilinx-tpg Xilinx Video Test Pattern Generator xilinx-video Xilinx Video IP (EXPERIMENTAL)Documentation/admin-guide/media/v4l-drivers.rst +0
-1@@ -13,7 +13,6 @@ Video4Linux (V4L) driver-specific documentation cafe_ccic cpia2 cx88 - davinci-vpbe fimc imx imx7Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst deleted +0
-39@@ -1,39 +0,0 @@ -.. SPDX-License-Identifier: GPL-2.0 - -The VPBE V4L2 driver design -=========================== - -File partitioning ------------------ - - V4L2 display device driver - drivers/media/platform/ti/davinci/vpbe_display.c - drivers/media/platform/ti/davinci/vpbe_display.h - - VPBE display controller - drivers/media/platform/ti/davinci/vpbe.c - drivers/media/platform/ti/davinci/vpbe.h - - VPBE venc sub device driver - drivers/media/platform/ti/davinci/vpbe_venc.c - drivers/media/platform/ti/davinci/vpbe_venc.h - drivers/media/platform/ti/davinci/vpbe_venc_regs.h - - VPBE osd driver - drivers/media/platform/ti/davinci/vpbe_osd.c - drivers/media/platform/ti/davinci/vpbe_osd.h - drivers/media/platform/ti/davinci/vpbe_osd_regs.h - -To be done ----------- - -vpbe display controller - - Add support for external encoders. - - add support for selecting external encoder as default at probe time. - -vpbe venc sub device - - add timings for supporting ths8200 - - add support for LogicPD LCD. - -FB drivers - - Add support for fbdev drivers.- Ready and part of subsequent patches.Documentation/driver-api/media/drivers/index.rst +0
-1@@ -16,7 +16,6 @@ Video4Linux (V4L) drivers cpia2_devel cx2341x-devel cx88-devel - davinci-vpbe-devel fimc-devel pvrusb2 pxa_cameradrivers/media/platform/ti/davinci/Kconfig +0
-16@@ -31,19 +31,3 @@ config VIDEO_DAVINCI_VPIF_CAPTURE To compile this driver as a module, choose M here. There will be two modules called vpif.ko and vpif_capture.ko - -config VIDEO_DAVINCI_VPBE_DISPLAY - tristate "TI DaVinci VPBE V4L2-Display driver" - depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_DEV - depends on ARCH_DAVINCI || COMPILE_TEST - depends on I2C - select VIDEOBUF2_DMA_CONTIG - help - Enables Davinci VPBE module used for display devices. - This module is used for display on TI DM644x/DM365/DM355 - based display devices. - - To compile this driver as a module, choose M here. There will - be five modules created called vpss.ko, vpbe.ko, vpbe_osd.ko, - vpbe_venc.ko and vpbe_display.kodrivers/media/platform/ti/davinci/Makefile +0
-3@@ -7,6 +7,3 @@ obj-$(CONFIG_VIDEO_DAVINCI_VPIF_DISPLAY) += vpif.o vpif_display.o #VPIF Capture driver obj-$(CONFIG_VIDEO_DAVINCI_VPIF_CAPTURE) += vpif.o vpif_capture.o - -obj-$(CONFIG_VIDEO_DAVINCI_VPBE_DISPLAY) += vpss.o vpbe.o vpbe_osd.o \ - vpbe_venc.o vpbe_display.odrivers/media/platform/ti/davinci/vpbe.c deleted +0
-840@@ -1,840 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* -* Copyright (C) 2010 Texas Instruments Inc -*/ -#include <linux/kernel.h> -#include <linux/init.h> -#include <linux/module.h> -#include <linux/errno.h> -#include <linux/fs.h> -#include <linux/string.h> -#include <linux/wait.h> -#include <linux/time.h> -#include <linux/platform_device.h> -#include <linux/io.h> -#include <linux/slab.h> -#include <linux/clk.h> -#include <linux/err.h> - -#include <media/v4l2-device.h> -#include <media/davinci/vpbe_types.h> -#include <media/davinci/vpbe.h> -#include <media/davinci/vpss.h> -#include <media/davinci/vpbe_venc.h> - -#define VPBE_DEFAULT_OUTPUT "Composite" -#define VPBE_DEFAULT_MODE "ntsc" - -static char *def_output =VPBE_DEFAULT_OUTPUT ; -static char *def_mode =VPBE_DEFAULT_MODE ; -static int debug; - -module_param (def_output, charp,S_IRUGO ); -module_param (def_mode, charp,S_IRUGO ); -module_param (debug, int,0644 ); - -MODULE_PARM_DESC (def_output,"vpbe output name (default:Composite)" ); -MODULE_PARM_DESC (def_mode,"vpbe output mode name (default:ntsc" ); -MODULE_PARM_DESC (debug,"Debug level 0-1" ); - -MODULE_DESCRIPTION ("TI DMXXX VPBE Display controller" ); -MODULE_LICENSE ("GPL" ); -MODULE_AUTHOR ("Texas Instruments" ); - -/** -* vpbe_current_encoder_info - Get config info for current encoder -* @vpbe_dev: vpbe device ptr -* -* Return ptr to current encoder config info -*/ -static struct encoder_config_info * -vpbe_current_encoder_info (struct vpbe_device *vpbe_dev) -{ -struct vpbe_config *cfg = vpbe_dev->cfg; -int index = vpbe_dev->current_sd_index; - -return ((index ==0 ) ? &cfg->venc : - &cfg->ext_encoders[index-1 ]); -} - -/** -* vpbe_find_encoder_sd_index - Given a name find encoder sd index -* -* @cfg: ptr to vpbe cfg -* @index: index used by application -* -* Return sd index of the encoder -*/ -static int vpbe_find_encoder_sd_index (struct vpbe_config *cfg, -int index) -{ -char *encoder_name = cfg->outputs[index].subdev_name; -int i; - -/* Venc is always first */ -if (!strcmp (encoder_name, cfg->venc.module_name)) -return 0 ; - -for (i =0 ; i < cfg->num_ext_encoders; i++) { -if (!strcmp (encoder_name, - cfg->ext_encoders[i].module_name)) -return i+1 ; - } - -return -EINVAL ; -} - -/** -* vpbe_enum_outputs - enumerate outputs -* @vpbe_dev: vpbe device ptr -* @output: ptr to v4l2_output structure -* -* Enumerates the outputs available at the vpbe display -* returns the status, -EINVAL if end of output list -*/ -static int vpbe_enum_outputs (struct vpbe_device *vpbe_dev, -struct v4l2_output *output) -{ -struct vpbe_config *cfg = vpbe_dev->cfg; -unsigned int temp_index = output->index; - -if (temp_index >= cfg->num_outputs) -return -EINVAL ; - - *output = cfg->outputs[temp_index].output; - output->index = temp_index; - -return 0 ; -} - -static int vpbe_get_mode_info (struct vpbe_device *vpbe_dev,char *mode, -int output_index) -{ -struct vpbe_config *cfg = vpbe_dev->cfg; -struct vpbe_enc_mode_info var; -int curr_output = output_index; -int i; - -if (!mode) -return -EINVAL ; - -for (i =0 ; i < cfg->outputs[curr_output].num_modes; i++) { - var = cfg->outputs[curr_output].modes[i]; -if (!strcmp (mode, var.name)) { - vpbe_dev->current_timings = var; -return 0 ; - } - } - -return -EINVAL ; -} - -static int vpbe_get_current_mode_info (struct vpbe_device *vpbe_dev, -struct vpbe_enc_mode_info *mode_info) -{ -if (!mode_info) -return -EINVAL ; - - *mode_info = vpbe_dev->current_timings; - -return 0 ; -} - -/* Get std by std id */ -static int vpbe_get_std_info (struct vpbe_device *vpbe_dev, -v4l2_std_id std_id) -{ -struct vpbe_config *cfg = vpbe_dev->cfg; -struct vpbe_enc_mode_info var; -int curr_output = vpbe_dev->current_out_index; -int i; - -for (i =0 ; i < vpbe_dev->cfg->outputs[curr_output].num_modes; i++) { - var = cfg->outputs[curr_output].modes[i]; -if ((var.timings_type &VPBE_ENC_STD ) && - (var.std_id & std_id)) { - vpbe_dev->current_timings = var; -return 0 ; - } - } - -return -EINVAL ; -} - -static int vpbe_get_std_info_by_name (struct vpbe_device *vpbe_dev, -char *std_name) -{ -struct vpbe_config *cfg = vpbe_dev->cfg; -struct vpbe_enc_mode_info var; -int curr_output = vpbe_dev->current_out_index; -int i; - -for (i =0 ; i < vpbe_dev->cfg->outputs[curr_output].num_modes; i++) { - var = cfg->outputs[curr_output].modes[i]; -if (!strcmp (var.name, std_name)) { - vpbe_dev->current_timings = var; -return 0 ; - } - } - -return -EINVAL ; -} - -/** -* vpbe_set_output - Set output -* @vpbe_dev: vpbe device ptr -* @index: index of output -* -* Set vpbe output to the output specified by the index -*/ -static int vpbe_set_output (struct vpbe_device *vpbe_dev,int index) -{ -struct encoder_config_info *curr_enc_info = -vpbe_current_encoder_info (vpbe_dev); -struct vpbe_config *cfg = vpbe_dev->cfg; -struct venc_platform_data *venc_device = vpbe_dev->venc_device; -int enc_out_index; -int sd_index; -int ret; - -if (index >= cfg->num_outputs) -return -EINVAL ; - -mutex_lock (&vpbe_dev->lock); - - sd_index = vpbe_dev->current_sd_index; - enc_out_index = cfg->outputs[index].output.index; -/* -* Currently we switch the encoder based on output selected -* by the application. If media controller is implemented later -* there is will be an API added to setup_link between venc -* and external encoder. So in that case below comparison always -* match and encoder will not be switched. But if application -* chose not to use media controller, then this provides current -* way of switching encoder at the venc output. -*/ -if (strcmp (curr_enc_info->module_name, - cfg->outputs[index].subdev_name)) { -/* Need to switch the encoder at the output */ - sd_index =vpbe_find_encoder_sd_index (cfg, index); -if (sd_index <0 ) { - ret = -EINVAL ; - goto unlock; - } - - ret = venc_device->setup_if_config (cfg->outputs[index].if_params); -if (ret) - goto unlock; - } - -/* Set output at the encoder */ - ret =v4l2_subdev_call (vpbe_dev->encoders[sd_index], video, - s_routing,0 , enc_out_index,0 ); -if (ret) - goto unlock; - -/* -* It is assumed that venc or external encoder will set a default -* mode in the sub device. For external encoder or LCD pannel output, -* we also need to set up the lcd port for the required mode. So setup -* the lcd port for the default mode that is configured in the board -* arch/arm/mach-davinci/board-dm355-evm.setup file for the external -* encoder. -*/ - ret =vpbe_get_mode_info (vpbe_dev, - cfg->outputs[index].default_mode, index); -if (!ret) { -struct osd_state *osd_device = vpbe_dev->osd_device; - - osd_device->ops.set_left_margin (osd_device, - vpbe_dev->current_timings.left_margin); - osd_device->ops.set_top_margin (osd_device, - vpbe_dev->current_timings.upper_margin); - vpbe_dev->current_sd_index = sd_index; - vpbe_dev->current_out_index = index; - } -unlock: -mutex_unlock (&vpbe_dev->lock); -return ret; -} - -static int vpbe_set_default_output (struct vpbe_device *vpbe_dev) -{ -struct vpbe_config *cfg = vpbe_dev->cfg; -int i; - -for (i =0 ; i < cfg->num_outputs; i++) { -if (!strcmp (def_output, - cfg->outputs[i].output.name)) { -int ret =vpbe_set_output (vpbe_dev, i); - -if (!ret) - vpbe_dev->current_out_index = i; -return ret; - } - } -return 0 ; -} - -/** -* vpbe_get_output - Get output -* @vpbe_dev: vpbe device ptr -* -* return current vpbe output to the index -*/ -static unsigned int vpbe_get_output (struct vpbe_device *vpbe_dev) -{ -return vpbe_dev->current_out_index; -} - -/* -* vpbe_s_dv_timings - Set the given preset timings in the encoder -* -* Sets the timings if supported by the current encoder. Return the status. -* 0 - success & -EINVAL on error -*/ -static int vpbe_s_dv_timings (struct vpbe_device *vpbe_dev, -struct v4l2_dv_timings *dv_timings) -{ -struct vpbe_config *cfg = vpbe_dev->cfg; -int out_index = vpbe_dev->current_out_index; -struct vpbe_output *output = &cfg->outputs[out_index]; -int sd_index = vpbe_dev->current_sd_index; -int ret, i; - - -if (!(cfg->outputs[out_index].output.capabilities & -V4L2_OUT_CAP_DV_TIMINGS )) -return -ENODATA ; - -for (i =0 ; i < output->num_modes; i++) { -if (output->modes[i].timings_type ==VPBE_ENC_DV_TIMINGS && - !memcmp (&output->modes[i].dv_timings, - dv_timings,sizeof (*dv_timings))) -break ; - } -if (i >= output->num_modes) -return -EINVAL ; - vpbe_dev->current_timings = output->modes[i]; -mutex_lock (&vpbe_dev->lock); - - ret =v4l2_subdev_call (vpbe_dev->encoders[sd_index], video, - s_dv_timings, dv_timings); -if (!ret && vpbe_dev->amp) { -/* Call amplifier subdevice */ - ret =v4l2_subdev_call (vpbe_dev->amp, video, - s_dv_timings, dv_timings); - } -/* set the lcd controller output for the given mode */ -if (!ret) { -struct osd_state *osd_device = vpbe_dev->osd_device; - - osd_device->ops.set_left_margin (osd_device, - vpbe_dev->current_timings.left_margin); - osd_device->ops.set_top_margin (osd_device, - vpbe_dev->current_timings.upper_margin); - } -mutex_unlock (&vpbe_dev->lock); - -return ret; -} - -/* -* vpbe_g_dv_timings - Get the timings in the current encoder -* -* Get the timings in the current encoder. Return the status. 0 - success -* -EINVAL on error -*/ -static int vpbe_g_dv_timings (struct vpbe_device *vpbe_dev, -struct v4l2_dv_timings *dv_timings) -{ -struct vpbe_config *cfg = vpbe_dev->cfg; -int out_index = vpbe_dev->current_out_index; - -if (!(cfg->outputs[out_index].output.capabilities & -V4L2_OUT_CAP_DV_TIMINGS )) -return -ENODATA ; - -if (vpbe_dev->current_timings.timings_type & -VPBE_ENC_DV_TIMINGS ) { - *dv_timings = vpbe_dev->current_timings.dv_timings; -return 0 ; - } - -return -EINVAL ; -} - -/* -* vpbe_enum_dv_timings - Enumerate the dv timings in the current encoder -* -* Get the timings in the current encoder. Return the status. 0 - success -* -EINVAL on error -*/ -static int vpbe_enum_dv_timings (struct vpbe_device *vpbe_dev, -struct v4l2_enum_dv_timings *timings) -{ -struct vpbe_config *cfg = vpbe_dev->cfg; -int out_index = vpbe_dev->current_out_index; -struct vpbe_output *output = &cfg->outputs[out_index]; -int j =0 ; -int i; - -if (!(output->output.capabilities &V4L2_OUT_CAP_DV_TIMINGS )) -return -ENODATA ; - -for (i =0 ; i < output->num_modes; i++) { -if (output->modes[i].timings_type ==VPBE_ENC_DV_TIMINGS ) { -if (j == timings->index) -break ; - j++; - } - } - -if (i == output->num_modes) -return -EINVAL ; - timings->timings = output->modes[i].dv_timings; -return 0 ; -} - -/* -* vpbe_s_std - Set the given standard in the encoder -* -* Sets the standard if supported by the current encoder. Return the status. -* 0 - success & -EINVAL on error -*/ -static int vpbe_s_std (struct vpbe_device *vpbe_dev,v4l2_std_id std_id) -{ -struct vpbe_config *cfg = vpbe_dev->cfg; -int out_index = vpbe_dev->current_out_index; -int sd_index = vpbe_dev->current_sd_index; -int ret; - -if (!(cfg->outputs[out_index].output.capabilities & -V4L2_OUT_CAP_STD )) -return -ENODATA ; - - ret =vpbe_get_std_info (vpbe_dev, std_id); -if (ret) -return ret; - -mutex_lock (&vpbe_dev->lock); - - ret =v4l2_subdev_call (vpbe_dev->encoders[sd_index], video, - s_std_output, std_id); -/* set the lcd controller output for the given mode */ -if (!ret) { -struct osd_state *osd_device = vpbe_dev->osd_device; - - osd_device->ops.set_left_margin (osd_device, - vpbe_dev->current_timings.left_margin); - osd_device->ops.set_top_margin (osd_device, - vpbe_dev->current_timings.upper_margin); - } -mutex_unlock (&vpbe_dev->lock); - -return ret; -} - -/* -* vpbe_g_std - Get the standard in the current encoder -* -* Get the standard in the current encoder. Return the status. 0 - success -* -EINVAL on error -*/ -static int vpbe_g_std (struct vpbe_device *vpbe_dev,v4l2_std_id *std_id) -{ -struct vpbe_enc_mode_info *cur_timings = &vpbe_dev->current_timings; -struct vpbe_config *cfg = vpbe_dev->cfg; -int out_index = vpbe_dev->current_out_index; - -if (!(cfg->outputs[out_index].output.capabilities &V4L2_OUT_CAP_STD )) -return -ENODATA ; - -if (cur_timings->timings_type &VPBE_ENC_STD ) { - *std_id = cur_timings->std_id; -return 0 ; - } - -return -EINVAL ; -} - -/* -* vpbe_set_mode - Set mode in the current encoder using mode info -* -* Use the mode string to decide what timings to set in the encoder -* This is typically useful when fbset command is used to change the current -* timings by specifying a string to indicate the timings. -*/ -static int vpbe_set_mode (struct vpbe_device *vpbe_dev, -struct vpbe_enc_mode_info *mode_info) -{ -struct vpbe_enc_mode_info *preset_mode =NULL ; -struct vpbe_config *cfg = vpbe_dev->cfg; -struct v4l2_dv_timings dv_timings; -struct osd_state *osd_device; -int out_index = vpbe_dev->current_out_index; -int i; - -if (!mode_info || !mode_info->name) -return -EINVAL ; - -for (i =0 ; i < cfg->outputs[out_index].num_modes; i++) { -if (!strcmp (mode_info->name, - cfg->outputs[out_index].modes[i].name)) { - preset_mode = &cfg->outputs[out_index].modes[i]; -/* -* it may be one of the 3 timings type. Check and -* invoke right API -*/ -if (preset_mode->timings_type &VPBE_ENC_STD ) -return vpbe_s_std (vpbe_dev, - preset_mode->std_id); -if (preset_mode->timings_type & -VPBE_ENC_DV_TIMINGS ) { - dv_timings = - preset_mode->dv_timings; -return vpbe_s_dv_timings (vpbe_dev, &dv_timings); - } - } - } - -/* Only custom timing should reach here */ -if (!preset_mode) -return -EINVAL ; - -mutex_lock (&vpbe_dev->lock); - - osd_device = vpbe_dev->osd_device; - vpbe_dev->current_timings = *preset_mode; - osd_device->ops.set_left_margin (osd_device, - vpbe_dev->current_timings.left_margin); - osd_device->ops.set_top_margin (osd_device, - vpbe_dev->current_timings.upper_margin); - -mutex_unlock (&vpbe_dev->lock); -return 0 ; -} - -static int vpbe_set_default_mode (struct vpbe_device *vpbe_dev) -{ -int ret; - - ret =vpbe_get_std_info_by_name (vpbe_dev, def_mode); -if (ret) -return ret; - -/* set the default mode in the encoder */ -return vpbe_set_mode (vpbe_dev, &vpbe_dev->current_timings); -} - -static int platform_device_get (struct device *dev,void *data) -{ -struct platform_device *pdev =to_platform_device (dev); -struct vpbe_device *vpbe_dev = data; - -if (strstr (pdev->name,"vpbe-osd" )) - vpbe_dev->osd_device =platform_get_drvdata (pdev); -if (strstr (pdev->name,"vpbe-venc" )) - vpbe_dev->venc_device =dev_get_platdata (&pdev->dev); - -return 0 ; -} - -/** -* vpbe_initialize() - Initialize the vpbe display controller -* @dev: Master and slave device ptr -* @vpbe_dev: vpbe device ptr -* -* Master frame buffer device drivers calls this to initialize vpbe -* display controller. This will then registers v4l2 device and the sub -* devices and sets a current encoder sub device for display. v4l2 display -* device driver is the master and frame buffer display device driver is -* the slave. Frame buffer display driver checks the initialized during -* probe and exit if not initialized. Returns status. -*/ -static int vpbe_initialize (struct device *dev,struct vpbe_device *vpbe_dev) -{ -struct encoder_config_info *enc_info; -struct amp_config_info *amp_info; -struct v4l2_subdev **enc_subdev; -struct osd_state *osd_device; -struct i2c_adapter *i2c_adap; -int num_encoders; -int ret =0 ; -int err; -int i; - -/* -* v4l2 abd FBDev frame buffer devices will get the vpbe_dev pointer -* from the platform device by iteration of platform drivers and -* matching with device name -*/ -if (!vpbe_dev || !dev) { -printk (KERN_ERR "Null device pointers.\n" ); -return -ENODEV ; - } - -if (vpbe_dev->initialized) -return 0 ; - -mutex_lock (&vpbe_dev->lock); - -if (strcmp (vpbe_dev->cfg->module_name,"dm644x-vpbe-display" ) !=0 ) { -/* We have dac clock available for platform */ - vpbe_dev->dac_clk =clk_get (vpbe_dev->pdev,"vpss_dac" ); -if (IS_ERR (vpbe_dev->dac_clk)) { - ret =PTR_ERR (vpbe_dev->dac_clk); - goto fail_mutex_unlock; - } -if (clk_prepare_enable (vpbe_dev->dac_clk)) { - ret = -ENODEV ; -clk_put (vpbe_dev->dac_clk); - goto fail_mutex_unlock; - } - } - -/* first enable vpss clocks */ -vpss_enable_clock (VPSS_VPBE_CLOCK ,1 ); - -/* First register a v4l2 device */ - ret =v4l2_device_register (dev, &vpbe_dev->v4l2_dev); -if (ret) { -v4l2_err (dev->driver, -"Unable to register v4l2 device.\n" ); - goto fail_clk_put; - } -v4l2_info (&vpbe_dev->v4l2_dev,"vpbe v4l2 device registered\n" ); - - err =bus_for_each_dev (&platform_bus_type,NULL , vpbe_dev, - platform_device_get); -if (err <0 ) { - ret = err; - goto fail_dev_unregister; - } - - vpbe_dev->venc =venc_sub_dev_init (&vpbe_dev->v4l2_dev, - vpbe_dev->cfg->venc.module_name); -/* register venc sub device */ -if (!vpbe_dev->venc) { -v4l2_err (&vpbe_dev->v4l2_dev, -"vpbe unable to init venc sub device\n" ); - ret = -ENODEV ; - goto fail_dev_unregister; - } -/* initialize osd device */ - osd_device = vpbe_dev->osd_device; -if (osd_device->ops.initialize) { - err = osd_device->ops.initialize (osd_device); -if (err) { -v4l2_err (&vpbe_dev->v4l2_dev, -"unable to initialize the OSD device" ); - ret = -ENOMEM ; - goto fail_dev_unregister; - } - } - -/* -* Register any external encoders that are configured. At index 0 we -* store venc sd index. -*/ - num_encoders = vpbe_dev->cfg->num_ext_encoders +1 ; - vpbe_dev->encoders =kmalloc_array (num_encoders, -sizeof (*vpbe_dev->encoders), -GFP_KERNEL ); -if (!vpbe_dev->encoders) { - ret = -ENOMEM ; - goto fail_dev_unregister; - } - - i2c_adap =i2c_get_adapter (vpbe_dev->cfg->i2c_adapter_id); -for (i =0 ; i < (vpbe_dev->cfg->num_ext_encoders +1 ); i++) { -if (i ==0 ) { -/* venc is at index 0 */ - enc_subdev = &vpbe_dev->encoders[i]; - *enc_subdev = vpbe_dev->venc; -continue ; - } - enc_info = &vpbe_dev->cfg->ext_encoders[i]; -if (enc_info->is_i2c) { - enc_subdev = &vpbe_dev->encoders[i]; - *enc_subdev =v4l2_i2c_new_subdev_board ( - &vpbe_dev->v4l2_dev, i2c_adap, - &enc_info->board_info,NULL ); -if (*enc_subdev) -v4l2_info (&vpbe_dev->v4l2_dev, -"v4l2 sub device %s registered\n" , - enc_info->module_name); -else { -v4l2_err (&vpbe_dev->v4l2_dev,"encoder %s failed to register" , - enc_info->module_name); - ret = -ENODEV ; - goto fail_kfree_encoders; - } - }else -v4l2_warn (&vpbe_dev->v4l2_dev,"non-i2c encoders currently not supported" ); - } -/* Add amplifier subdevice for dm365 */ -if ((strcmp (vpbe_dev->cfg->module_name,"dm365-vpbe-display" ) ==0 ) && - vpbe_dev->cfg->amp) { - amp_info = vpbe_dev->cfg->amp; -if (amp_info->is_i2c) { - vpbe_dev->amp =v4l2_i2c_new_subdev_board ( - &vpbe_dev->v4l2_dev, i2c_adap, - &_info->board_info,NULL ); -if (!vpbe_dev->amp) { -v4l2_err (&vpbe_dev->v4l2_dev, -"amplifier %s failed to register" , - amp_info->module_name); - ret = -ENODEV ; - goto fail_kfree_encoders; - } -v4l2_info (&vpbe_dev->v4l2_dev, -"v4l2 sub device %s registered\n" , - amp_info->module_name); - }else { - vpbe_dev->amp =NULL ; -v4l2_warn (&vpbe_dev->v4l2_dev,"non-i2c amplifiers currently not supported" ); - } - }else { - vpbe_dev->amp =NULL ; - } - -/* set the current encoder and output to that of venc by default */ - vpbe_dev->current_sd_index =0 ; - vpbe_dev->current_out_index =0 ; - -mutex_unlock (&vpbe_dev->lock); - -printk (KERN_NOTICE "Setting default output to %s\n" , def_output); - ret =vpbe_set_default_output (vpbe_dev); -if (ret) { -v4l2_err (&vpbe_dev->v4l2_dev,"Failed to set default output %s" , - def_output); - goto fail_kfree_amp; - } - -printk (KERN_NOTICE "Setting default mode to %s\n" , def_mode); - ret =vpbe_set_default_mode (vpbe_dev); -if (ret) { -v4l2_err (&vpbe_dev->v4l2_dev,"Failed to set default mode %s" , - def_mode); - goto fail_kfree_amp; - } - vpbe_dev->initialized =1 ; -/* TBD handling of bootargs for default output and mode */ -return 0 ; - -fail_kfree_amp: -mutex_lock (&vpbe_dev->lock); -kfree (vpbe_dev->amp); -fail_kfree_encoders: -kfree (vpbe_dev->encoders); -fail_dev_unregister: -v4l2_device_unregister (&vpbe_dev->v4l2_dev); -fail_clk_put: -if (strcmp (vpbe_dev->cfg->module_name,"dm644x-vpbe-display" ) !=0 ) { -clk_disable_unprepare (vpbe_dev->dac_clk); -clk_put (vpbe_dev->dac_clk); - } -fail_mutex_unlock: -mutex_unlock (&vpbe_dev->lock); -return ret; -} - -/** -* vpbe_deinitialize() - de-initialize the vpbe display controller -* @dev: Master and slave device ptr -* @vpbe_dev: vpbe device ptr -* -* vpbe_master and slave frame buffer devices calls this to de-initialize -* the display controller. It is called when master and slave device -* driver modules are removed and no longer requires the display controller. -*/ -static void vpbe_deinitialize (struct device *dev,struct vpbe_device *vpbe_dev) -{ -v4l2_device_unregister (&vpbe_dev->v4l2_dev); -if (strcmp (vpbe_dev->cfg->module_name,"dm644x-vpbe-display" ) !=0 ) { -clk_disable_unprepare (vpbe_dev->dac_clk); -clk_put (vpbe_dev->dac_clk); - } - -kfree (vpbe_dev->amp); -kfree (vpbe_dev->encoders); - vpbe_dev->initialized =0 ; -/* disable vpss clocks */ -vpss_enable_clock (VPSS_VPBE_CLOCK ,0 ); -} - -static const struct vpbe_device_ops vpbe_dev_ops = { - .enum_outputs = vpbe_enum_outputs, - .set_output = vpbe_set_output, - .get_output = vpbe_get_output, - .s_dv_timings = vpbe_s_dv_timings, - .g_dv_timings = vpbe_g_dv_timings, - .enum_dv_timings = vpbe_enum_dv_timings, - .s_std = vpbe_s_std, - .g_std = vpbe_g_std, - .initialize = vpbe_initialize, - .deinitialize = vpbe_deinitialize, - .get_mode_info = vpbe_get_current_mode_info, - .set_mode = vpbe_set_mode, -}; - -static int vpbe_probe (struct platform_device *pdev) -{ -struct vpbe_device *vpbe_dev; -struct vpbe_config *cfg; - -if (!pdev->dev.platform_data) { -v4l2_err (pdev->dev.driver,"No platform data\n" ); -return -ENODEV ; - } - cfg = pdev->dev.platform_data; - -if (!cfg->module_name[0 ] || - !cfg->osd.module_name[0 ] || - !cfg->venc.module_name[0 ]) { -v4l2_err (pdev->dev.driver,"vpbe display module names not defined\n" ); -return -EINVAL ; - } - - vpbe_dev =kzalloc (sizeof (*vpbe_dev),GFP_KERNEL ); -if (!vpbe_dev) -return -ENOMEM ; - - vpbe_dev->cfg = cfg; - vpbe_dev->ops = vpbe_dev_ops; - vpbe_dev->pdev = &pdev->dev; - -if (cfg->outputs->num_modes >0 ) - vpbe_dev->current_timings = vpbe_dev->cfg->outputs[0 ].modes[0 ]; -else { -kfree (vpbe_dev); -return -ENODEV ; - } - -/* set the driver data in platform device */ -platform_set_drvdata (pdev, vpbe_dev); -mutex_init (&vpbe_dev->lock); - -return 0 ; -} - -static int vpbe_remove (struct platform_device *device) -{ -struct vpbe_device *vpbe_dev =platform_get_drvdata (device); - -kfree (vpbe_dev); - -return 0 ; -} - -static struct platform_driver vpbe_driver = { - .driver = { - .name ="vpbe_controller" , - }, - .probe = vpbe_probe, - .remove = vpbe_remove, -}; - -module_platform_driver (vpbe_driver);drivers/media/platform/ti/davinci/vpbe_display.c deleted +0
-1510@@ -1,1510 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* -* Copyright (C) 2010 Texas Instruments Incorporated - https://www.ti.com/ -*/ -#include <linux/kernel.h> -#include <linux/init.h> -#include <linux/module.h> -#include <linux/errno.h> -#include <linux/interrupt.h> -#include <linux/string.h> -#include <linux/wait.h> -#include <linux/time.h> -#include <linux/platform_device.h> -#include <linux/irq.h> -#include <linux/mm.h> -#include <linux/mutex.h> -#include <linux/videodev2.h> -#include <linux/slab.h> - - -#include <media/v4l2-dev.h> -#include <media/v4l2-common.h> -#include <media/v4l2-ioctl.h> -#include <media/v4l2-device.h> -#include <media/davinci/vpbe_display.h> -#include <media/davinci/vpbe_types.h> -#include <media/davinci/vpbe.h> -#include <media/davinci/vpbe_venc.h> -#include <media/davinci/vpbe_osd.h> -#include "vpbe_venc_regs.h" - -#define VPBE_DISPLAY_DRIVER "vpbe-v4l2" - -static int debug; - -#define VPBE_DEFAULT_NUM_BUFS 3 - -module_param (debug, int,0644 ); - -static int vpbe_set_osd_display_params (struct vpbe_display *disp_dev, -struct vpbe_layer *layer); - -static int venc_is_second_field (struct vpbe_display *disp_dev) -{ -struct vpbe_device *vpbe_dev = disp_dev->vpbe_dev; -int ret, val; - - ret =v4l2_subdev_call (vpbe_dev->venc, - core, - command, -VENC_GET_FLD , - &val); -if (ret <0 ) { -v4l2_err (&vpbe_dev->v4l2_dev, -"Error in getting Field ID 0\n" ); -return 1 ; - } -return val; -} - -static void vpbe_isr_even_field (struct vpbe_display *disp_obj, -struct vpbe_layer *layer) -{ -if (layer->cur_frm == layer->next_frm) -return ; - - layer->cur_frm->vb.vb2_buf.timestamp =ktime_get_ns (); -vb2_buffer_done (&layer->cur_frm->vb.vb2_buf,VB2_BUF_STATE_DONE ); -/* Make cur_frm pointing to next_frm */ - layer->cur_frm = layer->next_frm; -} - -static void vpbe_isr_odd_field (struct vpbe_display *disp_obj, -struct vpbe_layer *layer) -{ -struct osd_state *osd_device = disp_obj->osd_device; -unsigned long addr; - -spin_lock (&disp_obj->dma_queue_lock); -if (list_empty (&layer->dma_queue) || - (layer->cur_frm != layer->next_frm)) { -spin_unlock (&disp_obj->dma_queue_lock); -return ; - } -/* -* one field is displayed configure -* the next frame if it is available -* otherwise hold on current frame -* Get next from the buffer queue -*/ - layer->next_frm =list_entry (layer->dma_queue.next, - struct vpbe_disp_buffer, list); -/* Remove that from the buffer queue */ -list_del (&layer->next_frm->list); -spin_unlock (&disp_obj->dma_queue_lock); -/* Mark state of the frame to active */ - layer->next_frm->vb.vb2_buf.state =VB2_BUF_STATE_ACTIVE ; - addr =vb2_dma_contig_plane_dma_addr (&layer->next_frm->vb.vb2_buf,0 ); - osd_device->ops.start_layer (osd_device, - layer->layer_info.id, - addr, - disp_obj->cbcr_ofst); -} - -/* interrupt service routine */ -static irqreturn_t venc_isr (int irq,void *arg) -{ -struct vpbe_display *disp_dev = (struct vpbe_display *)arg; -struct vpbe_layer *layer; -static unsigned last_event; -unsigned event =0 ; -int fid; -int i; - -if (!arg || !disp_dev->dev[0 ]) -return IRQ_HANDLED ; - -if (venc_is_second_field (disp_dev)) - event |=VENC_SECOND_FIELD ; -else - event |=VENC_FIRST_FIELD ; - -if (event == (last_event & ~VENC_END_OF_FRAME )) { -/* -* If the display is non-interlaced, then we need to flag the -* end-of-frame event at every interrupt regardless of the -* value of the FIDST bit. We can conclude that the display is -* non-interlaced if the value of the FIDST bit is unchanged -* from the previous interrupt. -*/ - event |=VENC_END_OF_FRAME ; - }else if (event ==VENC_SECOND_FIELD ) { -/* end-of-frame for interlaced display */ - event |=VENC_END_OF_FRAME ; - } - last_event = event; - -for (i =0 ; i <VPBE_DISPLAY_MAX_DEVICES ; i++) { - layer = disp_dev->dev[i]; - -if (!vb2_start_streaming_called (&layer->buffer_queue)) -continue ; - -if (layer->layer_first_int) { - layer->layer_first_int =0 ; -continue ; - } -/* Check the field format */ -if ((V4L2_FIELD_NONE == layer->pix_fmt.field) && - (event &VENC_END_OF_FRAME )) { -/* Progressive mode */ - -vpbe_isr_even_field (disp_dev, layer); -vpbe_isr_odd_field (disp_dev, layer); - }else { -/* Interlaced mode */ - - layer->field_id ^=1 ; -if (event &VENC_FIRST_FIELD ) - fid =0 ; -else - fid =1 ; - -/* -* If field id does not match with store -* field id -*/ -if (fid != layer->field_id) { -/* Make them in sync */ - layer->field_id = fid; -continue ; - } -/* -* device field id and local field id are -* in sync. If this is even field -*/ -if (0 == fid) -vpbe_isr_even_field (disp_dev, layer); -else /* odd field */ -vpbe_isr_odd_field (disp_dev, layer); - } - } - -return IRQ_HANDLED ; -} - -/* -* vpbe_buffer_prepare() -* This is the callback function called from vb2_qbuf() function -* the buffer is prepared and user space virtual address is converted into -* physical address -*/ -static int vpbe_buffer_prepare (struct vb2_buffer *vb) -{ -struct vb2_queue *q = vb->vb2_queue; -struct vpbe_layer *layer =vb2_get_drv_priv (q); -struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev; -unsigned long addr; - -v4l2_dbg (1 , debug, &vpbe_dev->v4l2_dev, -"vpbe_buffer_prepare\n" ); - -vb2_set_plane_payload (vb,0 , layer->pix_fmt.sizeimage); -if (vb2_get_plane_payload (vb,0 ) >vb2_plane_size (vb,0 )) -return -EINVAL ; - - addr =vb2_dma_contig_plane_dma_addr (vb,0 ); -if (!IS_ALIGNED (addr,8 )) { -v4l2_err (&vpbe_dev->v4l2_dev, -"buffer_prepare:offset is not aligned to 32 bytes\n" ); -return -EINVAL ; - } -return 0 ; -} - -/* -* vpbe_buffer_setup() -* This function allocates memory for the buffers -*/ -static int -vpbe_buffer_queue_setup (struct vb2_queue *vq, -unsigned int *nbuffers,unsigned int *nplanes, -unsigned int sizes[],struct device *alloc_devs[]) - -{ -/* Get the file handle object and layer object */ -struct vpbe_layer *layer =vb2_get_drv_priv (vq); -struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev; - -v4l2_dbg (1 , debug, &vpbe_dev->v4l2_dev,"vpbe_buffer_setup\n" ); - -/* Store number of buffers allocated in numbuffer member */ -if (vq->num_buffers + *nbuffers <VPBE_DEFAULT_NUM_BUFS ) - *nbuffers =VPBE_DEFAULT_NUM_BUFS - vq->num_buffers; - -if (*nplanes) -return sizes[0 ] < layer->pix_fmt.sizeimage ? -EINVAL :0 ; - - *nplanes =1 ; - sizes[0 ] = layer->pix_fmt.sizeimage; - -return 0 ; -} - -/* -* vpbe_buffer_queue() -* This function adds the buffer to DMA queue -*/ -static void vpbe_buffer_queue (struct vb2_buffer *vb) -{ -struct vb2_v4l2_buffer *vbuf =to_vb2_v4l2_buffer (vb); -/* Get the file handle object and layer object */ -struct vpbe_disp_buffer *buf =container_of (vbuf, - struct vpbe_disp_buffer, vb); -struct vpbe_layer *layer =vb2_get_drv_priv (vb->vb2_queue); -struct vpbe_display *disp = layer->disp_dev; -struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev; -unsigned long flags; - -v4l2_dbg (1 , debug, &vpbe_dev->v4l2_dev, -"vpbe_buffer_queue\n" ); - -/* add the buffer to the DMA queue */ -spin_lock_irqsave (&disp->dma_queue_lock, flags); -list_add_tail (&buf->list, &layer->dma_queue); -spin_unlock_irqrestore (&disp->dma_queue_lock, flags); -} - -static int vpbe_start_streaming (struct vb2_queue *vq,unsigned int count) -{ -struct vpbe_layer *layer =vb2_get_drv_priv (vq); -struct osd_state *osd_device = layer->disp_dev->osd_device; -int ret; - - osd_device->ops.disable_layer (osd_device, layer->layer_info.id); - -/* Get the next frame from the buffer queue */ - layer->next_frm = layer->cur_frm =list_entry (layer->dma_queue.next, - struct vpbe_disp_buffer, list); -/* Remove buffer from the buffer queue */ -list_del (&layer->cur_frm->list); -/* Mark state of the current frame to active */ - layer->cur_frm->vb.vb2_buf.state =VB2_BUF_STATE_ACTIVE ; -/* Initialize field_id and started member */ - layer->field_id =0 ; - -/* Set parameters in OSD and VENC */ - ret =vpbe_set_osd_display_params (layer->disp_dev, layer); -if (ret <0 ) { -struct vpbe_disp_buffer *buf, *tmp; - -vb2_buffer_done (&layer->cur_frm->vb.vb2_buf, -VB2_BUF_STATE_QUEUED ); -list_for_each_entry_safe (buf, tmp, &layer->dma_queue, list) { -list_del (&buf->list); -vb2_buffer_done (&buf->vb.vb2_buf, -VB2_BUF_STATE_QUEUED ); - } - -return ret; - } - -/* -* if request format is yuv420 semiplanar, need to -* enable both video windows -*/ - layer->layer_first_int =1 ; - -return ret; -} - -static void vpbe_stop_streaming (struct vb2_queue *vq) -{ -struct vpbe_layer *layer =vb2_get_drv_priv (vq); -struct osd_state *osd_device = layer->disp_dev->osd_device; -struct vpbe_display *disp = layer->disp_dev; -unsigned long flags; - -if (!vb2_is_streaming (vq)) -return ; - - osd_device->ops.disable_layer (osd_device, layer->layer_info.id); - -/* release all active buffers */ -spin_lock_irqsave (&disp->dma_queue_lock, flags); -if (layer->cur_frm == layer->next_frm) { -vb2_buffer_done (&layer->cur_frm->vb.vb2_buf, -VB2_BUF_STATE_ERROR ); - }else { -if (layer->cur_frm) -vb2_buffer_done (&layer->cur_frm->vb.vb2_buf, -VB2_BUF_STATE_ERROR ); -if (layer->next_frm) -vb2_buffer_done (&layer->next_frm->vb.vb2_buf, -VB2_BUF_STATE_ERROR ); - } - -while (!list_empty (&layer->dma_queue)) { - layer->next_frm =list_entry (layer->dma_queue.next, - struct vpbe_disp_buffer, list); -list_del (&layer->next_frm->list); -vb2_buffer_done (&layer->next_frm->vb.vb2_buf, -VB2_BUF_STATE_ERROR ); - } -spin_unlock_irqrestore (&disp->dma_queue_lock, flags); -} - -static const struct vb2_ops video_qops = { - .queue_setup = vpbe_buffer_queue_setup, - .wait_prepare = vb2_ops_wait_prepare, - .wait_finish = vb2_ops_wait_finish, - .buf_prepare = vpbe_buffer_prepare, - .start_streaming = vpbe_start_streaming, - .stop_streaming = vpbe_stop_streaming, - .buf_queue = vpbe_buffer_queue, -}; - -static -struct vpbe_layer * -_vpbe_display_get_other_win_layer (struct vpbe_display *disp_dev, -struct vpbe_layer *layer) -{ -enum vpbe_display_device_id thiswin, otherwin; - thiswin = layer->device_id; - - otherwin = (thiswin ==VPBE_DISPLAY_DEVICE_0 ) ? -VPBE_DISPLAY_DEVICE_1 :VPBE_DISPLAY_DEVICE_0 ; -return disp_dev->dev[otherwin]; -} - -static int vpbe_set_osd_display_params (struct vpbe_display *disp_dev, -struct vpbe_layer *layer) -{ -struct osd_layer_config *cfg = &layer->layer_info.config; -struct osd_state *osd_device = disp_dev->osd_device; -struct vpbe_device *vpbe_dev = disp_dev->vpbe_dev; -unsigned long addr; -int ret; - - addr =vb2_dma_contig_plane_dma_addr (&layer->cur_frm->vb.vb2_buf,0 ); -/* Set address in the display registers */ - osd_device->ops.start_layer (osd_device, - layer->layer_info.id, - addr, - disp_dev->cbcr_ofst); - - ret = osd_device->ops.enable_layer (osd_device, - layer->layer_info.id,0 ); -if (ret <0 ) { -v4l2_err (&vpbe_dev->v4l2_dev, -"Error in enabling osd window layer 0\n" ); -return -1 ; - } - -/* Enable the window */ - layer->layer_info.enable =1 ; -if (cfg->pixfmt ==PIXFMT_NV12 ) { -struct vpbe_layer *otherlayer = -_vpbe_display_get_other_win_layer (disp_dev, layer); - - ret = osd_device->ops.enable_layer (osd_device, - otherlayer->layer_info.id,1 ); -if (ret <0 ) { -v4l2_err (&vpbe_dev->v4l2_dev, -"Error in enabling osd window layer 1\n" ); -return -1 ; - } - otherlayer->layer_info.enable =1 ; - } -return 0 ; -} - -static void -vpbe_disp_calculate_scale_factor (struct vpbe_display *disp_dev, -struct vpbe_layer *layer, -int expected_xsize,int expected_ysize) -{ -struct display_layer_info *layer_info = &layer->layer_info; -struct v4l2_pix_format *pixfmt = &layer->pix_fmt; -struct osd_layer_config *cfg = &layer->layer_info.config; -struct vpbe_device *vpbe_dev = disp_dev->vpbe_dev; -int calculated_xsize; -int h_exp =0 ; -int v_exp =0 ; -int h_scale; -int v_scale; - -v4l2_std_id standard_id = vpbe_dev->current_timings.std_id; - -/* -* Application initially set the image format. Current display -* size is obtained from the vpbe display controller. expected_xsize -* and expected_ysize are set through S_SELECTION ioctl. Based on this, -* driver will calculate the scale factors for vertical and -* horizontal direction so that the image is displayed scaled -* and expanded. Application uses expansion to display the image -* in a square pixel. Otherwise it is displayed using displays -* pixel aspect ratio.It is expected that application chooses -* the crop coordinates for cropped or scaled display. if crop -* size is less than the image size, it is displayed cropped or -* it is displayed scaled and/or expanded. -* -* to begin with, set the crop window same as expected. Later we -* will override with scaled window size -*/ - - cfg->xsize = pixfmt->width; - cfg->ysize = pixfmt->height; - layer_info->h_zoom =ZOOM_X1 ;/* no horizontal zoom */ - layer_info->v_zoom =ZOOM_X1 ;/* no horizontal zoom */ - layer_info->h_exp =H_EXP_OFF ;/* no horizontal zoom */ - layer_info->v_exp =V_EXP_OFF ;/* no horizontal zoom */ - -if (pixfmt->width < expected_xsize) { - h_scale = vpbe_dev->current_timings.xres / pixfmt->width; -if (h_scale <2 ) - h_scale =1 ; -else if (h_scale >=4 ) - h_scale =4 ; -else - h_scale =2 ; - cfg->xsize *= h_scale; -if (cfg->xsize < expected_xsize) { -if ((standard_id &V4L2_STD_525_60 ) || - (standard_id &V4L2_STD_625_50 )) { - calculated_xsize = (cfg->xsize * -VPBE_DISPLAY_H_EXP_RATIO_N ) / -VPBE_DISPLAY_H_EXP_RATIO_D ; -if (calculated_xsize <= expected_xsize) { - h_exp =1 ; - cfg->xsize = calculated_xsize; - } - } - } -if (h_scale ==2 ) - layer_info->h_zoom =ZOOM_X2 ; -else if (h_scale ==4 ) - layer_info->h_zoom =ZOOM_X4 ; -if (h_exp) - layer_info->h_exp =H_EXP_9_OVER_8 ; - }else { -/* no scaling, only cropping. Set display area to crop area */ - cfg->xsize = expected_xsize; - } - -if (pixfmt->height < expected_ysize) { - v_scale = expected_ysize / pixfmt->height; -if (v_scale <2 ) - v_scale =1 ; -else if (v_scale >=4 ) - v_scale =4 ; -else - v_scale =2 ; - cfg->ysize *= v_scale; -if (cfg->ysize < expected_ysize) { -if ((standard_id &V4L2_STD_625_50 )) { - calculated_xsize = (cfg->ysize * -VPBE_DISPLAY_V_EXP_RATIO_N ) / -VPBE_DISPLAY_V_EXP_RATIO_D ; -if (calculated_xsize <= expected_ysize) { - v_exp =1 ; - cfg->ysize = calculated_xsize; - } - } - } -if (v_scale ==2 ) - layer_info->v_zoom =ZOOM_X2 ; -else if (v_scale ==4 ) - layer_info->v_zoom =ZOOM_X4 ; -if (v_exp) - layer_info->v_exp =V_EXP_6_OVER_5 ; - }else { -/* no scaling, only cropping. Set display area to crop area */ - cfg->ysize = expected_ysize; - } -v4l2_dbg (1 , debug, &vpbe_dev->v4l2_dev, -"crop display xsize = %d, ysize = %d\n" , - cfg->xsize, cfg->ysize); -} - -static void vpbe_disp_adj_position (struct vpbe_display *disp_dev, -struct vpbe_layer *layer, -int top,int left) -{ -struct osd_layer_config *cfg = &layer->layer_info.config; -struct vpbe_device *vpbe_dev = disp_dev->vpbe_dev; - - cfg->xpos =min ((unsigned int )left, - vpbe_dev->current_timings.xres - cfg->xsize); - cfg->ypos =min ((unsigned int )top, - vpbe_dev->current_timings.yres - cfg->ysize); - -v4l2_dbg (1 , debug, &vpbe_dev->v4l2_dev, -"new xpos = %d, ypos = %d\n" , - cfg->xpos, cfg->ypos); -} - -static void vpbe_disp_check_window_params (struct vpbe_display *disp_dev, -struct v4l2_rect *c) -{ -struct vpbe_device *vpbe_dev = disp_dev->vpbe_dev; - -if ((c->width ==0 ) || - ((c->width + c->left) > vpbe_dev->current_timings.xres)) - c->width = vpbe_dev->current_timings.xres - c->left; - -if ((c->height ==0 ) || ((c->height + c->top) > - vpbe_dev->current_timings.yres)) - c->height = vpbe_dev->current_timings.yres - c->top; - -/* window height must be even for interlaced display */ -if (vpbe_dev->current_timings.interlaced) - c->height &= (~0x01 ); - -} - -/* -* vpbe_try_format() -* If user application provides width and height, and have bytesperline set -* to zero, driver calculates bytesperline and sizeimage based on hardware -* limits. -*/ -static int vpbe_try_format (struct vpbe_display *disp_dev, -struct v4l2_pix_format *pixfmt,int check) -{ -struct vpbe_device *vpbe_dev = disp_dev->vpbe_dev; -int min_height =1 ; -int min_width =32 ; -int max_height; -int max_width; -int bpp; - -if ((pixfmt->pixelformat !=V4L2_PIX_FMT_UYVY ) && - (pixfmt->pixelformat !=V4L2_PIX_FMT_NV12 )) -/* choose default as V4L2_PIX_FMT_UYVY */ - pixfmt->pixelformat =V4L2_PIX_FMT_UYVY ; - -/* Check the field format */ -if ((pixfmt->field !=V4L2_FIELD_INTERLACED ) && - (pixfmt->field !=V4L2_FIELD_NONE )) { -if (vpbe_dev->current_timings.interlaced) - pixfmt->field =V4L2_FIELD_INTERLACED ; -else - pixfmt->field =V4L2_FIELD_NONE ; - } - -if (pixfmt->field ==V4L2_FIELD_INTERLACED ) - min_height =2 ; - -if (pixfmt->pixelformat ==V4L2_PIX_FMT_NV12 ) - bpp =1 ; -else - bpp =2 ; - - max_width = vpbe_dev->current_timings.xres; - max_height = vpbe_dev->current_timings.yres; - - min_width /= bpp; - -if (!pixfmt->width || (pixfmt->width < min_width) || - (pixfmt->width > max_width)) { - pixfmt->width = vpbe_dev->current_timings.xres; - } - -if (!pixfmt->height || (pixfmt->height < min_height) || - (pixfmt->height > max_height)) { - pixfmt->height = vpbe_dev->current_timings.yres; - } - -if (pixfmt->bytesperline < (pixfmt->width * bpp)) - pixfmt->bytesperline = pixfmt->width * bpp; - -/* Make the bytesperline 32 byte aligned */ - pixfmt->bytesperline = ((pixfmt->width * bpp +31 ) & ~31 ); - -if (pixfmt->pixelformat ==V4L2_PIX_FMT_NV12 ) - pixfmt->sizeimage = pixfmt->bytesperline * pixfmt->height + - (pixfmt->bytesperline * pixfmt->height >>1 ); -else - pixfmt->sizeimage = pixfmt->bytesperline * pixfmt->height; - -return 0 ; -} - -static int vpbe_display_querycap (struct file *file,void *priv, -struct v4l2_capability *cap) -{ -struct vpbe_layer *layer =video_drvdata (file); -struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev; - -snprintf (cap->driver,sizeof (cap->driver),"%s" , -dev_name (vpbe_dev->pdev)); -strscpy (cap->card, vpbe_dev->cfg->module_name,sizeof (cap->card)); - -return 0 ; -} - -static int vpbe_display_s_selection (struct file *file,void *priv, -struct v4l2_selection *sel) -{ -struct vpbe_layer *layer =video_drvdata (file); -struct vpbe_display *disp_dev = layer->disp_dev; -struct vpbe_device *vpbe_dev = disp_dev->vpbe_dev; -struct osd_layer_config *cfg = &layer->layer_info.config; -struct osd_state *osd_device = disp_dev->osd_device; -struct v4l2_rect rect = sel->r; -int ret; - -v4l2_dbg (1 , debug, &vpbe_dev->v4l2_dev, -"VIDIOC_S_SELECTION, layer id = %d\n" , layer->device_id); - -if (sel->type !=V4L2_BUF_TYPE_VIDEO_OUTPUT || - sel->target !=V4L2_SEL_TGT_CROP ) -return -EINVAL ; - -if (rect.top <0 ) - rect.top =0 ; -if (rect.left <0 ) - rect.left =0 ; - -vpbe_disp_check_window_params (disp_dev, &rect); - - osd_device->ops.get_layer_config (osd_device, - layer->layer_info.id, cfg); - -vpbe_disp_calculate_scale_factor (disp_dev, layer, - rect.width, - rect.height); -vpbe_disp_adj_position (disp_dev, layer, rect.top, - rect.left); - ret = osd_device->ops.set_layer_config (osd_device, - layer->layer_info.id, cfg); -if (ret <0 ) { -v4l2_err (&vpbe_dev->v4l2_dev, -"Error in set layer config:\n" ); -return -EINVAL ; - } - -/* apply zooming and h or v expansion */ - osd_device->ops.set_zoom (osd_device, - layer->layer_info.id, - layer->layer_info.h_zoom, - layer->layer_info.v_zoom); - ret = osd_device->ops.set_vid_expansion (osd_device, - layer->layer_info.h_exp, - layer->layer_info.v_exp); -if (ret <0 ) { -v4l2_err (&vpbe_dev->v4l2_dev, -"Error in set vid expansion:\n" ); -return -EINVAL ; - } - -if ((layer->layer_info.h_zoom !=ZOOM_X1 ) || - (layer->layer_info.v_zoom !=ZOOM_X1 ) || - (layer->layer_info.h_exp !=H_EXP_OFF ) || - (layer->layer_info.v_exp !=V_EXP_OFF )) -/* Enable expansion filter */ - osd_device->ops.set_interpolation_filter (osd_device,1 ); -else - osd_device->ops.set_interpolation_filter (osd_device,0 ); - - sel->r = rect; -return 0 ; -} - -static int vpbe_display_g_selection (struct file *file,void *priv, -struct v4l2_selection *sel) -{ -struct vpbe_layer *layer =video_drvdata (file); -struct osd_layer_config *cfg = &layer->layer_info.config; -struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev; -struct osd_state *osd_device = layer->disp_dev->osd_device; -struct v4l2_rect *rect = &sel->r; - -v4l2_dbg (1 , debug, &vpbe_dev->v4l2_dev, -"VIDIOC_G_SELECTION, layer id = %d\n" , - layer->device_id); - -if (sel->type !=V4L2_BUF_TYPE_VIDEO_OUTPUT ) -return -EINVAL ; - -switch (sel->target) { -case V4L2_SEL_TGT_CROP : - osd_device->ops.get_layer_config (osd_device, - layer->layer_info.id, cfg); - rect->top = cfg->ypos; - rect->left = cfg->xpos; - rect->width = cfg->xsize; - rect->height = cfg->ysize; -break ; -case V4L2_SEL_TGT_CROP_DEFAULT : -case V4L2_SEL_TGT_CROP_BOUNDS : - rect->left =0 ; - rect->top =0 ; - rect->width = vpbe_dev->current_timings.xres; - rect->height = vpbe_dev->current_timings.yres; -break ; -default : -return -EINVAL ; - } - -return 0 ; -} - -static int vpbe_display_g_pixelaspect (struct file *file,void *priv, -int type,struct v4l2_fract *f) -{ -struct vpbe_layer *layer =video_drvdata (file); -struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev; - -v4l2_dbg (1 , debug, &vpbe_dev->v4l2_dev,"VIDIOC_CROPCAP ioctl\n" ); - -if (type !=V4L2_BUF_TYPE_VIDEO_OUTPUT ) -return -EINVAL ; - - *f = vpbe_dev->current_timings.aspect; -return 0 ; -} - -static int vpbe_display_g_fmt (struct file *file,void *priv, -struct v4l2_format *fmt) -{ -struct vpbe_layer *layer =video_drvdata (file); -struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev; - -v4l2_dbg (1 , debug, &vpbe_dev->v4l2_dev, -"VIDIOC_G_FMT, layer id = %d\n" , - layer->device_id); - -/* If buffer type is video output */ -if (V4L2_BUF_TYPE_VIDEO_OUTPUT != fmt->type) { -v4l2_err (&vpbe_dev->v4l2_dev,"invalid type\n" ); -return -EINVAL ; - } -/* Fill in the information about format */ - fmt->fmt.pix = layer->pix_fmt; - -return 0 ; -} - -static int vpbe_display_enum_fmt (struct file *file,void *priv, -struct v4l2_fmtdesc *fmt) -{ -struct vpbe_layer *layer =video_drvdata (file); -struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev; - -v4l2_dbg (1 , debug, &vpbe_dev->v4l2_dev, -"VIDIOC_ENUM_FMT, layer id = %d\n" , - layer->device_id); -if (fmt->index >1 ) { -v4l2_err (&vpbe_dev->v4l2_dev,"Invalid format index\n" ); -return -EINVAL ; - } - -/* Fill in the information about format */ -if (fmt->index ==0 ) - fmt->pixelformat =V4L2_PIX_FMT_UYVY ; -else - fmt->pixelformat =V4L2_PIX_FMT_NV12 ; - -return 0 ; -} - -static int vpbe_display_s_fmt (struct file *file,void *priv, -struct v4l2_format *fmt) -{ -struct vpbe_layer *layer =video_drvdata (file); -struct vpbe_display *disp_dev = layer->disp_dev; -struct vpbe_device *vpbe_dev = disp_dev->vpbe_dev; -struct osd_layer_config *cfg = &layer->layer_info.config; -struct v4l2_pix_format *pixfmt = &fmt->fmt.pix; -struct osd_state *osd_device = disp_dev->osd_device; -int ret; - -v4l2_dbg (1 , debug, &vpbe_dev->v4l2_dev, -"VIDIOC_S_FMT, layer id = %d\n" , - layer->device_id); - -if (vb2_is_busy (&layer->buffer_queue)) -return -EBUSY ; - -if (V4L2_BUF_TYPE_VIDEO_OUTPUT != fmt->type) { -v4l2_dbg (1 , debug, &vpbe_dev->v4l2_dev,"invalid type\n" ); -return -EINVAL ; - } -/* Check for valid pixel format */ - ret =vpbe_try_format (disp_dev, pixfmt,1 ); -if (ret) -return ret; - -/* YUV420 is requested, check availability of the -other video window */ - - layer->pix_fmt = *pixfmt; -if (pixfmt->pixelformat ==V4L2_PIX_FMT_NV12 ) { -struct vpbe_layer *otherlayer; - - otherlayer =_vpbe_display_get_other_win_layer (disp_dev, layer); -/* if other layer is available, only -* claim it, do not configure it -*/ - ret = osd_device->ops.request_layer (osd_device, - otherlayer->layer_info.id); -if (ret <0 ) { -v4l2_err (&vpbe_dev->v4l2_dev, -"Display Manager failed to allocate layer\n" ); -return -EBUSY ; - } - } - -/* Get osd layer config */ - osd_device->ops.get_layer_config (osd_device, - layer->layer_info.id, cfg); -/* Store the pixel format in the layer object */ - cfg->xsize = pixfmt->width; - cfg->ysize = pixfmt->height; - cfg->line_length = pixfmt->bytesperline; - cfg->ypos =0 ; - cfg->xpos =0 ; - cfg->interlaced = vpbe_dev->current_timings.interlaced; - -if (V4L2_PIX_FMT_UYVY == pixfmt->pixelformat) - cfg->pixfmt =PIXFMT_YCBCRI ; - -/* Change of the default pixel format for both video windows */ -if (V4L2_PIX_FMT_NV12 == pixfmt->pixelformat) { -struct vpbe_layer *otherlayer; - cfg->pixfmt =PIXFMT_NV12 ; - otherlayer =_vpbe_display_get_other_win_layer (disp_dev, - layer); - otherlayer->layer_info.config.pixfmt =PIXFMT_NV12 ; - } - -/* Set the layer config in the osd window */ - ret = osd_device->ops.set_layer_config (osd_device, - layer->layer_info.id, cfg); -if (ret <0 ) { -v4l2_err (&vpbe_dev->v4l2_dev, -"Error in S_FMT params:\n" ); -return -EINVAL ; - } - -/* Readback and fill the local copy of current pix format */ - osd_device->ops.get_layer_config (osd_device, - layer->layer_info.id, cfg); - -return 0 ; -} - -static int vpbe_display_try_fmt (struct file *file,void *priv, -struct v4l2_format *fmt) -{ -struct vpbe_layer *layer =video_drvdata (file); -struct vpbe_display *disp_dev = layer->disp_dev; -struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev; -struct v4l2_pix_format *pixfmt = &fmt->fmt.pix; - -v4l2_dbg (1 , debug, &vpbe_dev->v4l2_dev,"VIDIOC_TRY_FMT\n" ); - -if (V4L2_BUF_TYPE_VIDEO_OUTPUT != fmt->type) { -v4l2_err (&vpbe_dev->v4l2_dev,"invalid type\n" ); -return -EINVAL ; - } - -/* Check for valid field format */ -return vpbe_try_format (disp_dev, pixfmt,0 ); - -} - -/* -* vpbe_display_s_std - Set the given standard in the encoder -* -* Sets the standard if supported by the current encoder. Return the status. -* 0 - success & -EINVAL on error -*/ -static int vpbe_display_s_std (struct file *file,void *priv, -v4l2_std_id std_id) -{ -struct vpbe_layer *layer =video_drvdata (file); -struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev; -int ret; - -v4l2_dbg (1 , debug, &vpbe_dev->v4l2_dev,"VIDIOC_S_STD\n" ); - -if (vb2_is_busy (&layer->buffer_queue)) -return -EBUSY ; - -if (vpbe_dev->ops.s_std) { - ret = vpbe_dev->ops.s_std (vpbe_dev, std_id); -if (ret) { -v4l2_err (&vpbe_dev->v4l2_dev, -"Failed to set standard for sub devices\n" ); -return -EINVAL ; - } - }else { -return -EINVAL ; - } - -return 0 ; -} - -/* -* vpbe_display_g_std - Get the standard in the current encoder -* -* Get the standard in the current encoder. Return the status. 0 - success -* -EINVAL on error -*/ -static int vpbe_display_g_std (struct file *file,void *priv, -v4l2_std_id *std_id) -{ -struct vpbe_layer *layer =video_drvdata (file); -struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev; - -v4l2_dbg (1 , debug, &vpbe_dev->v4l2_dev,"VIDIOC_G_STD\n" ); - -/* Get the standard from the current encoder */ -if (vpbe_dev->current_timings.timings_type &VPBE_ENC_STD ) { - *std_id = vpbe_dev->current_timings.std_id; -return 0 ; - } - -return -EINVAL ; -} - -/* -* vpbe_display_enum_output - enumerate outputs -* -* Enumerates the outputs available at the vpbe display -* returns the status, -EINVAL if end of output list -*/ -static int vpbe_display_enum_output (struct file *file,void *priv, -struct v4l2_output *output) -{ -struct vpbe_layer *layer =video_drvdata (file); -struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev; -int ret; - -v4l2_dbg (1 , debug, &vpbe_dev->v4l2_dev,"VIDIOC_ENUM_OUTPUT\n" ); - -/* Enumerate outputs */ -if (!vpbe_dev->ops.enum_outputs) -return -EINVAL ; - - ret = vpbe_dev->ops.enum_outputs (vpbe_dev, output); -if (ret) { -v4l2_dbg (1 , debug, &vpbe_dev->v4l2_dev, -"Failed to enumerate outputs\n" ); -return -EINVAL ; - } - -return 0 ; -} - -/* -* vpbe_display_s_output - Set output to -* the output specified by the index -*/ -static int vpbe_display_s_output (struct file *file,void *priv, -unsigned int i) -{ -struct vpbe_layer *layer =video_drvdata (file); -struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev; -int ret; - -v4l2_dbg (1 , debug, &vpbe_dev->v4l2_dev,"VIDIOC_S_OUTPUT\n" ); - -if (vb2_is_busy (&layer->buffer_queue)) -return -EBUSY ; - -if (!vpbe_dev->ops.set_output) -return -EINVAL ; - - ret = vpbe_dev->ops.set_output (vpbe_dev, i); -if (ret) { -v4l2_err (&vpbe_dev->v4l2_dev, -"Failed to set output for sub devices\n" ); -return -EINVAL ; - } - -return 0 ; -} - -/* -* vpbe_display_g_output - Get output from subdevice -* for a given by the index -*/ -static int vpbe_display_g_output (struct file *file,void *priv, -unsigned int *i) -{ -struct vpbe_layer *layer =video_drvdata (file); -struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev; - -v4l2_dbg (1 , debug, &vpbe_dev->v4l2_dev,"VIDIOC_G_OUTPUT\n" ); -/* Get the standard from the current encoder */ - *i = vpbe_dev->current_out_index; - -return 0 ; -} - -/* -* vpbe_display_enum_dv_timings - Enumerate the dv timings -* -* enum the timings in the current encoder. Return the status. 0 - success -* -EINVAL on error -*/ -static int -vpbe_display_enum_dv_timings (struct file *file,void *priv, -struct v4l2_enum_dv_timings *timings) -{ -struct vpbe_layer *layer =video_drvdata (file); -struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev; -int ret; - -v4l2_dbg (1 , debug, &vpbe_dev->v4l2_dev,"VIDIOC_ENUM_DV_TIMINGS\n" ); - -/* Enumerate outputs */ -if (!vpbe_dev->ops.enum_dv_timings) -return -EINVAL ; - - ret = vpbe_dev->ops.enum_dv_timings (vpbe_dev, timings); -if (ret) { -v4l2_err (&vpbe_dev->v4l2_dev, -"Failed to enumerate dv timings info\n" ); -return -EINVAL ; - } - -return 0 ; -} - -/* -* vpbe_display_s_dv_timings - Set the dv timings -* -* Set the timings in the current encoder. Return the status. 0 - success -* -EINVAL on error -*/ -static int -vpbe_display_s_dv_timings (struct file *file,void *priv, -struct v4l2_dv_timings *timings) -{ -struct vpbe_layer *layer =video_drvdata (file); -struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev; -int ret; - -v4l2_dbg (1 , debug, &vpbe_dev->v4l2_dev,"VIDIOC_S_DV_TIMINGS\n" ); - -if (vb2_is_busy (&layer->buffer_queue)) -return -EBUSY ; - -/* Set the given standard in the encoder */ -if (!vpbe_dev->ops.s_dv_timings) -return -EINVAL ; - - ret = vpbe_dev->ops.s_dv_timings (vpbe_dev, timings); -if (ret) { -v4l2_err (&vpbe_dev->v4l2_dev, -"Failed to set the dv timings info\n" ); -return -EINVAL ; - } - -return 0 ; -} - -/* -* vpbe_display_g_dv_timings - Set the dv timings -* -* Get the timings in the current encoder. Return the status. 0 - success -* -EINVAL on error -*/ -static int -vpbe_display_g_dv_timings (struct file *file,void *priv, -struct v4l2_dv_timings *dv_timings) -{ -struct vpbe_layer *layer =video_drvdata (file); -struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev; - -v4l2_dbg (1 , debug, &vpbe_dev->v4l2_dev,"VIDIOC_G_DV_TIMINGS\n" ); - -/* Get the given standard in the encoder */ - -if (vpbe_dev->current_timings.timings_type & -VPBE_ENC_DV_TIMINGS ) { - *dv_timings = vpbe_dev->current_timings.dv_timings; - }else { -return -EINVAL ; - } - -return 0 ; -} - -/* -* vpbe_display_open() -* It creates object of file handle structure and stores it in private_data -* member of filepointer -*/ -static int vpbe_display_open (struct file *file) -{ -struct vpbe_layer *layer =video_drvdata (file); -struct vpbe_display *disp_dev = layer->disp_dev; -struct vpbe_device *vpbe_dev = disp_dev->vpbe_dev; -struct osd_state *osd_device = disp_dev->osd_device; -int err; - -/* creating context for file descriptor */ - err =v4l2_fh_open (file); -if (err) { -v4l2_err (&vpbe_dev->v4l2_dev,"v4l2_fh_open failed\n" ); -return err; - } - -/* leaving if layer is already initialized */ -if (!v4l2_fh_is_singular_file (file)) -return err; - -if (!layer->usrs) { -if (mutex_lock_interruptible (&layer->opslock)) -return -ERESTARTSYS ; -/* First claim the layer for this device */ - err = osd_device->ops.request_layer (osd_device, - layer->layer_info.id); -mutex_unlock (&layer->opslock); -if (err <0 ) { -/* Couldn't get layer */ -v4l2_err (&vpbe_dev->v4l2_dev, -"Display Manager failed to allocate layer\n" ); -v4l2_fh_release (file); -return -EINVAL ; - } - } -/* Increment layer usrs counter */ - layer->usrs++; -v4l2_dbg (1 , debug, &vpbe_dev->v4l2_dev, -"vpbe display device opened successfully\n" ); -return 0 ; -} - -/* -* vpbe_display_release() -* This function deletes buffer queue, frees the buffers and the davinci -* display file * handle -*/ -static int vpbe_display_release (struct file *file) -{ -struct vpbe_layer *layer =video_drvdata (file); -struct osd_layer_config *cfg = &layer->layer_info.config; -struct vpbe_display *disp_dev = layer->disp_dev; -struct vpbe_device *vpbe_dev = disp_dev->vpbe_dev; -struct osd_state *osd_device = disp_dev->osd_device; - -v4l2_dbg (1 , debug, &vpbe_dev->v4l2_dev,"vpbe_display_release\n" ); - -mutex_lock (&layer->opslock); - - osd_device->ops.disable_layer (osd_device, - layer->layer_info.id); -/* Decrement layer usrs counter */ - layer->usrs--; -/* If this file handle has initialize encoder device, reset it */ -if (!layer->usrs) { -if (cfg->pixfmt ==PIXFMT_NV12 ) { -struct vpbe_layer *otherlayer; - otherlayer = -_vpbe_display_get_other_win_layer (disp_dev, layer); - osd_device->ops.disable_layer (osd_device, - otherlayer->layer_info.id); - osd_device->ops.release_layer (osd_device, - otherlayer->layer_info.id); - } - osd_device->ops.disable_layer (osd_device, - layer->layer_info.id); - osd_device->ops.release_layer (osd_device, - layer->layer_info.id); - } - -_vb2_fop_release (file,NULL ); -mutex_unlock (&layer->opslock); - - disp_dev->cbcr_ofst =0 ; - -return 0 ; -} - -/* vpbe capture ioctl operations */ -static const struct v4l2_ioctl_ops vpbe_ioctl_ops = { - .vidioc_querycap = vpbe_display_querycap, - .vidioc_g_fmt_vid_out = vpbe_display_g_fmt, - .vidioc_enum_fmt_vid_out = vpbe_display_enum_fmt, - .vidioc_s_fmt_vid_out = vpbe_display_s_fmt, - .vidioc_try_fmt_vid_out = vpbe_display_try_fmt, - - .vidioc_reqbufs = vb2_ioctl_reqbufs, - .vidioc_create_bufs = vb2_ioctl_create_bufs, - .vidioc_querybuf = vb2_ioctl_querybuf, - .vidioc_qbuf = vb2_ioctl_qbuf, - .vidioc_dqbuf = vb2_ioctl_dqbuf, - .vidioc_streamon = vb2_ioctl_streamon, - .vidioc_streamoff = vb2_ioctl_streamoff, - .vidioc_expbuf = vb2_ioctl_expbuf, - - .vidioc_g_pixelaspect = vpbe_display_g_pixelaspect, - .vidioc_g_selection = vpbe_display_g_selection, - .vidioc_s_selection = vpbe_display_s_selection, - - .vidioc_s_std = vpbe_display_s_std, - .vidioc_g_std = vpbe_display_g_std, - - .vidioc_enum_output = vpbe_display_enum_output, - .vidioc_s_output = vpbe_display_s_output, - .vidioc_g_output = vpbe_display_g_output, - - .vidioc_s_dv_timings = vpbe_display_s_dv_timings, - .vidioc_g_dv_timings = vpbe_display_g_dv_timings, - .vidioc_enum_dv_timings = vpbe_display_enum_dv_timings, -}; - -static const struct v4l2_file_operations vpbe_fops = { - .owner =THIS_MODULE , - .open = vpbe_display_open, - .release = vpbe_display_release, - .unlocked_ioctl = video_ioctl2, - .mmap = vb2_fop_mmap, - .poll = vb2_fop_poll, -}; - -static int vpbe_device_get (struct device *dev,void *data) -{ -struct platform_device *pdev =to_platform_device (dev); -struct vpbe_display *vpbe_disp = data; - -if (strcmp ("vpbe_controller" , pdev->name) ==0 ) - vpbe_disp->vpbe_dev =platform_get_drvdata (pdev); - -if (strstr (pdev->name,"vpbe-osd" )) - vpbe_disp->osd_device =platform_get_drvdata (pdev); - -return 0 ; -} - -static int init_vpbe_layer (int i,struct vpbe_display *disp_dev, -struct platform_device *pdev) -{ -struct vpbe_layer *vpbe_display_layer =NULL ; -struct video_device *vbd =NULL ; - -/* Allocate memory for four plane display objects */ - disp_dev->dev[i] =kzalloc (sizeof (*disp_dev->dev[i]),GFP_KERNEL ); -if (!disp_dev->dev[i]) -return -ENOMEM ; - -spin_lock_init (&disp_dev->dev[i]->irqlock); -mutex_init (&disp_dev->dev[i]->opslock); - -/* Get the pointer to the layer object */ - vpbe_display_layer = disp_dev->dev[i]; - vbd = &vpbe_display_layer->video_dev; -/* Initialize field of video device */ - vbd->release = video_device_release_empty; - vbd->fops = &vpbe_fops; - vbd->ioctl_ops = &vpbe_ioctl_ops; - vbd->minor =-1 ; - vbd->v4l2_dev = &disp_dev->vpbe_dev->v4l2_dev; - vbd->lock = &vpbe_display_layer->opslock; - vbd->vfl_dir =VFL_DIR_TX ; - vbd->device_caps =V4L2_CAP_VIDEO_OUTPUT |V4L2_CAP_STREAMING ; - -if (disp_dev->vpbe_dev->current_timings.timings_type & -VPBE_ENC_STD ) - vbd->tvnorms = (V4L2_STD_525_60 |V4L2_STD_625_50 ); - -snprintf (vbd->name,sizeof (vbd->name), -"DaVinci_VPBE Display_DRIVER_V%d.%d.%d" , - (VPBE_DISPLAY_VERSION_CODE >>16 ) &0xff , - (VPBE_DISPLAY_VERSION_CODE >>8 ) &0xff , - (VPBE_DISPLAY_VERSION_CODE ) &0xff ); - - vpbe_display_layer->device_id = i; - - vpbe_display_layer->layer_info.id = - ((i ==VPBE_DISPLAY_DEVICE_0 ) ?WIN_VID0 :WIN_VID1 ); - - -return 0 ; -} - -static int register_device (struct vpbe_layer *vpbe_display_layer, -struct vpbe_display *disp_dev, -struct platform_device *pdev) -{ -int err; - -v4l2_info (&disp_dev->vpbe_dev->v4l2_dev, -"Trying to register VPBE display device.\n" ); -v4l2_info (&disp_dev->vpbe_dev->v4l2_dev, -"layer=%p,layer->video_dev=%p\n" , - vpbe_display_layer, - &vpbe_display_layer->video_dev); - - vpbe_display_layer->video_dev.queue = &vpbe_display_layer->buffer_queue; - err =video_register_device (&vpbe_display_layer->video_dev, -VFL_TYPE_VIDEO , --1 ); -if (err) -return -ENODEV ; - - vpbe_display_layer->disp_dev = disp_dev; -/* set the driver data in platform device */ -platform_set_drvdata (pdev, disp_dev); -video_set_drvdata (&vpbe_display_layer->video_dev, - vpbe_display_layer); - -return 0 ; -} - - - -/* -* vpbe_display_probe() -* This function creates device entries by register itself to the V4L2 driver -* and initializes fields of each layer objects -*/ -static int vpbe_display_probe (struct platform_device *pdev) -{ -struct vpbe_display *disp_dev; -struct v4l2_device *v4l2_dev; -struct resource *res =NULL ; -struct vb2_queue *q; -int k; -int i; -int err; -int irq; - -printk (KERN_DEBUG "vpbe_display_probe\n" ); -/* Allocate memory for vpbe_display */ - disp_dev =devm_kzalloc (&pdev->dev,sizeof (*disp_dev),GFP_KERNEL ); -if (!disp_dev) -return -ENOMEM ; - -spin_lock_init (&disp_dev->dma_queue_lock); -/* -* Scan all the platform devices to find the vpbe -* controller device and get the vpbe_dev object -*/ - err =bus_for_each_dev (&platform_bus_type,NULL , disp_dev, - vpbe_device_get); -if (err <0 ) -return err; - - v4l2_dev = &disp_dev->vpbe_dev->v4l2_dev; -/* Initialize the vpbe display controller */ -if (disp_dev->vpbe_dev->ops.initialize) { - err = disp_dev->vpbe_dev->ops.initialize (&pdev->dev, - disp_dev->vpbe_dev); -if (err) { -v4l2_err (v4l2_dev,"Error initing vpbe\n" ); - err = -ENOMEM ; - goto probe_out; - } - } - -for (i =0 ; i <VPBE_DISPLAY_MAX_DEVICES ; i++) { -if (init_vpbe_layer (i, disp_dev, pdev)) { - err = -ENODEV ; - goto probe_out; - } - } - - res =platform_get_resource (pdev,IORESOURCE_IRQ ,0 ); -if (!res) { -v4l2_err (v4l2_dev,"Unable to get VENC interrupt resource\n" ); - err = -ENODEV ; - goto probe_out; - } - - irq = res->start; - err =devm_request_irq (&pdev->dev, irq, venc_isr,0 , -VPBE_DISPLAY_DRIVER , disp_dev); -if (err) { -v4l2_err (v4l2_dev,"VPBE IRQ request failed\n" ); - goto probe_out; - } - -for (i =0 ; i <VPBE_DISPLAY_MAX_DEVICES ; i++) { -/* initialize vb2 queue */ - q = &disp_dev->dev[i]->buffer_queue; -memset (q,0 ,sizeof (*q)); - q->type =V4L2_BUF_TYPE_VIDEO_OUTPUT ; - q->io_modes =VB2_MMAP |VB2_USERPTR |VB2_DMABUF ; - q->drv_priv = disp_dev->dev[i]; - q->ops = &video_qops; - q->mem_ops = &vb2_dma_contig_memops; - q->buf_struct_size =sizeof (struct vpbe_disp_buffer ); - q->timestamp_flags =V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC ; - q->min_buffers_needed =1 ; - q->lock = &disp_dev->dev[i]->opslock; - q->dev = disp_dev->vpbe_dev->pdev; - err =vb2_queue_init (q); -if (err) { -v4l2_err (v4l2_dev,"vb2_queue_init() failed\n" ); - goto probe_out; - } - -INIT_LIST_HEAD (&disp_dev->dev[i]->dma_queue); - -if (register_device (disp_dev->dev[i], disp_dev, pdev)) { - err = -ENODEV ; - goto probe_out; - } - } - -v4l2_dbg (1 , debug, v4l2_dev, -"Successfully completed the probing of vpbe v4l2 device\n" ); - -return 0 ; - -probe_out: -for (k =0 ; k <VPBE_DISPLAY_MAX_DEVICES ; k++) { -/* Unregister video device */ -if (disp_dev->dev[k]) { -video_unregister_device (&disp_dev->dev[k]->video_dev); -kfree (disp_dev->dev[k]); - } - } -return err; -} - -/* -* vpbe_display_remove() -* It un-register hardware layer from V4L2 driver -*/ -static int vpbe_display_remove (struct platform_device *pdev) -{ -struct vpbe_layer *vpbe_display_layer; -struct vpbe_display *disp_dev =platform_get_drvdata (pdev); -struct vpbe_device *vpbe_dev = disp_dev->vpbe_dev; -int i; - -v4l2_dbg (1 , debug, &vpbe_dev->v4l2_dev,"vpbe_display_remove\n" ); - -/* deinitialize the vpbe display controller */ -if (vpbe_dev->ops.deinitialize) - vpbe_dev->ops.deinitialize (&pdev->dev, vpbe_dev); -/* un-register device */ -for (i =0 ; i <VPBE_DISPLAY_MAX_DEVICES ; i++) { -/* Get the pointer to the layer object */ - vpbe_display_layer = disp_dev->dev[i]; -/* Unregister video device */ -video_unregister_device (&vpbe_display_layer->video_dev); - - } -for (i =0 ; i <VPBE_DISPLAY_MAX_DEVICES ; i++) { -kfree (disp_dev->dev[i]); - disp_dev->dev[i] =NULL ; - } - -return 0 ; -} - -static struct platform_driver vpbe_display_driver = { - .driver = { - .name =VPBE_DISPLAY_DRIVER , - .bus = &platform_bus_type, - }, - .probe = vpbe_display_probe, - .remove = vpbe_display_remove, -}; - -module_platform_driver (vpbe_display_driver); - -MODULE_DESCRIPTION ("TI DM644x/DM355/DM365 VPBE Display controller" ); -MODULE_LICENSE ("GPL" ); -MODULE_AUTHOR ("Texas Instruments" );drivers/media/platform/ti/davinci/vpbe_osd.c deleted +0
-1582@@ -1,1582 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* -* Copyright (C) 2007-2010 Texas Instruments Inc -* Copyright (C) 2007 MontaVista Software, Inc. -* -* Andy Lowe ([email protected]), MontaVista Software -* - Initial version -* Murali Karicheri ([email protected]), Texas Instruments Ltd. -* - ported to sub device interface -*/ -#include <linux/module.h> -#include <linux/mod_devicetable.h> -#include <linux/kernel.h> -#include <linux/interrupt.h> -#include <linux/platform_device.h> -#include <linux/clk.h> -#include <linux/slab.h> - -#include <media/davinci/vpss.h> -#include <media/v4l2-device.h> -#include <media/davinci/vpbe_types.h> -#include <media/davinci/vpbe_osd.h> - -#include <linux/io.h> -#include "vpbe_osd_regs.h" - -#define MODULE_NAME "davinci-vpbe-osd" - -static const struct platform_device_id vpbe_osd_devtype[] = { - { - .name =DM644X_VPBE_OSD_SUBDEV_NAME , - .driver_data =VPBE_VERSION_1 , - }, { - .name =DM365_VPBE_OSD_SUBDEV_NAME , - .driver_data =VPBE_VERSION_2 , - }, { - .name =DM355_VPBE_OSD_SUBDEV_NAME , - .driver_data =VPBE_VERSION_3 , - }, - { -/* sentinel */ - } -}; - -MODULE_DEVICE_TABLE (platform, vpbe_osd_devtype); - -/* register access routines */ -static inline u32 __always_unused osd_read (struct osd_state *sd,u32 offset) -{ -struct osd_state *osd = sd; - -return readl (osd->osd_base + offset); -} - -static inline u32 osd_write (struct osd_state *sd,u32 val,u32 offset) -{ -struct osd_state *osd = sd; - -writel (val, osd->osd_base + offset); - -return val; -} - -static inline u32 osd_set (struct osd_state *sd,u32 mask,u32 offset) -{ -struct osd_state *osd = sd; - -void __iomem *addr = osd->osd_base + offset; -u32 val =readl (addr) | mask; - -writel (val, addr); - -return val; -} - -static inline u32 osd_clear (struct osd_state *sd,u32 mask,u32 offset) -{ -struct osd_state *osd = sd; - -void __iomem *addr = osd->osd_base + offset; -u32 val =readl (addr) & ~mask; - -writel (val, addr); - -return val; -} - -static inline u32 osd_modify (struct osd_state *sd,u32 mask,u32 val, -u32 offset) -{ -struct osd_state *osd = sd; - -void __iomem *addr = osd->osd_base + offset; -u32 new_val = (readl (addr) & ~mask) | (val & mask); - -writel (new_val, addr); - -return new_val; -} - -/* define some macros for layer and pixfmt classification */ -#define is_osd_win (layer) (((layer) == WIN_OSD0) || ((layer) == WIN_OSD1)) -#define is_vid_win (layer) (((layer) == WIN_VID0) || ((layer) == WIN_VID1)) -#define is_rgb_pixfmt (pixfmt) \ - (((pixfmt) == PIXFMT_RGB565) || ((pixfmt) == PIXFMT_RGB888)) -#define is_yc_pixfmt (pixfmt) \ - (((pixfmt) == PIXFMT_YCBCRI) || ((pixfmt) == PIXFMT_YCRCBI) || \ - ((pixfmt) == PIXFMT_NV12)) -#define MAX_WIN_SIZE OSD_VIDWIN0XP_V0X -#define MAX_LINE_LENGTH (OSD_VIDWIN0OFST_V0LO << 5) - -/** -* _osd_dm6446_vid0_pingpong() - field inversion fix for DM6446 -* @sd: ptr to struct osd_state -* @field_inversion: inversion flag -* @fb_base_phys: frame buffer address -* @lconfig: ptr to layer config -* -* This routine implements a workaround for the field signal inversion silicon -* erratum described in Advisory 1.3.8 for the DM6446. The fb_base_phys and -* lconfig parameters apply to the vid0 window. This routine should be called -* whenever the vid0 layer configuration or start address is modified, or when -* the OSD field inversion setting is modified. -* Returns: 1 if the ping-pong buffers need to be toggled in the vsync isr, or -* 0 otherwise -*/ -static int _osd_dm6446_vid0_pingpong (struct osd_state *sd, -int field_inversion, -unsigned long fb_base_phys, -const struct osd_layer_config *lconfig) -{ -struct osd_platform_data *pdata; - - pdata = (struct osd_platform_data *)sd->dev->platform_data; -if (pdata !=NULL && pdata->field_inv_wa_enable) { - -if (!field_inversion || !lconfig->interlaced) { -osd_write (sd, fb_base_phys & ~0x1F ,OSD_VIDWIN0ADR ); -osd_write (sd, fb_base_phys & ~0x1F ,OSD_PPVWIN0ADR ); -osd_modify (sd,OSD_MISCCTL_PPSW |OSD_MISCCTL_PPRV ,0 , -OSD_MISCCTL ); -return 0 ; - }else { -unsigned miscctl =OSD_MISCCTL_PPRV ; - -osd_write (sd, - (fb_base_phys & ~0x1F ) - lconfig->line_length, -OSD_VIDWIN0ADR ); -osd_write (sd, - (fb_base_phys & ~0x1F ) + lconfig->line_length, -OSD_PPVWIN0ADR ); -osd_modify (sd, -OSD_MISCCTL_PPSW |OSD_MISCCTL_PPRV , miscctl, -OSD_MISCCTL ); - -return 1 ; - } - } - -return 0 ; -} - -static void _osd_set_field_inversion (struct osd_state *sd,int enable) -{ -unsigned fsinv =0 ; - -if (enable) - fsinv =OSD_MODE_FSINV ; - -osd_modify (sd,OSD_MODE_FSINV , fsinv,OSD_MODE ); -} - -static void _osd_set_blink_attribute (struct osd_state *sd,int enable, -enum osd_blink_interval blink) -{ -u32 osdatrmd =0 ; - -if (enable) { - osdatrmd |=OSD_OSDATRMD_BLNK ; - osdatrmd |= blink <<OSD_OSDATRMD_BLNKINT_SHIFT ; - } -/* caller must ensure that OSD1 is configured in attribute mode */ -osd_modify (sd,OSD_OSDATRMD_BLNKINT |OSD_OSDATRMD_BLNK , osdatrmd, -OSD_OSDATRMD ); -} - -static void _osd_set_rom_clut (struct osd_state *sd, -enum osd_rom_clut rom_clut) -{ -if (rom_clut ==ROM_CLUT0 ) -osd_clear (sd,OSD_MISCCTL_RSEL ,OSD_MISCCTL ); -else -osd_set (sd,OSD_MISCCTL_RSEL ,OSD_MISCCTL ); -} - -static void _osd_set_palette_map (struct osd_state *sd, -enum osd_win_layer osdwin, -unsigned char pixel_value, -unsigned char clut_index, -enum osd_pix_format pixfmt) -{ -static const int map_2bpp[] = {0 ,5 ,10 ,15 }; -static const int map_1bpp[] = {0 ,15 }; -int bmp_offset; -int bmp_shift; -int bmp_mask; -int bmp_reg; - -switch (pixfmt) { -case PIXFMT_1BPP : - bmp_reg = map_1bpp[pixel_value &0x1 ]; -break ; -case PIXFMT_2BPP : - bmp_reg = map_2bpp[pixel_value &0x3 ]; -break ; -case PIXFMT_4BPP : - bmp_reg = pixel_value &0xf ; -break ; -default : -return ; - } - -switch (osdwin) { -case OSDWIN_OSD0 : - bmp_offset =OSD_W0BMP01 + (bmp_reg >>1 ) *sizeof (u32); -break ; -case OSDWIN_OSD1 : - bmp_offset =OSD_W1BMP01 + (bmp_reg >>1 ) *sizeof (u32); -break ; -default : -return ; - } - -if (bmp_reg &1 ) { - bmp_shift =8 ; - bmp_mask =0xff <<8 ; - }else { - bmp_shift =0 ; - bmp_mask =0xff ; - } - -osd_modify (sd, bmp_mask, clut_index << bmp_shift, bmp_offset); -} - -static void _osd_set_rec601_attenuation (struct osd_state *sd, -enum osd_win_layer osdwin,int enable) -{ -switch (osdwin) { -case OSDWIN_OSD0 : -osd_modify (sd,OSD_OSDWIN0MD_ATN0E , - enable ?OSD_OSDWIN0MD_ATN0E :0 , -OSD_OSDWIN0MD ); -if (sd->vpbe_type ==VPBE_VERSION_1 ) -osd_modify (sd,OSD_OSDWIN0MD_ATN0E , - enable ?OSD_OSDWIN0MD_ATN0E :0 , -OSD_OSDWIN0MD ); -else if ((sd->vpbe_type ==VPBE_VERSION_3 ) || - (sd->vpbe_type ==VPBE_VERSION_2 )) -osd_modify (sd,OSD_EXTMODE_ATNOSD0EN , - enable ?OSD_EXTMODE_ATNOSD0EN :0 , -OSD_EXTMODE ); -break ; -case OSDWIN_OSD1 : -osd_modify (sd,OSD_OSDWIN1MD_ATN1E , - enable ?OSD_OSDWIN1MD_ATN1E :0 , -OSD_OSDWIN1MD ); -if (sd->vpbe_type ==VPBE_VERSION_1 ) -osd_modify (sd,OSD_OSDWIN1MD_ATN1E , - enable ?OSD_OSDWIN1MD_ATN1E :0 , -OSD_OSDWIN1MD ); -else if ((sd->vpbe_type ==VPBE_VERSION_3 ) || - (sd->vpbe_type ==VPBE_VERSION_2 )) -osd_modify (sd,OSD_EXTMODE_ATNOSD1EN , - enable ?OSD_EXTMODE_ATNOSD1EN :0 , -OSD_EXTMODE ); -break ; - } -} - -static void _osd_set_blending_factor (struct osd_state *sd, -enum osd_win_layer osdwin, -enum osd_blending_factor blend) -{ -switch (osdwin) { -case OSDWIN_OSD0 : -osd_modify (sd,OSD_OSDWIN0MD_BLND0 , - blend <<OSD_OSDWIN0MD_BLND0_SHIFT ,OSD_OSDWIN0MD ); -break ; -case OSDWIN_OSD1 : -osd_modify (sd,OSD_OSDWIN1MD_BLND1 , - blend <<OSD_OSDWIN1MD_BLND1_SHIFT ,OSD_OSDWIN1MD ); -break ; - } -} - -static void _osd_enable_rgb888_pixblend (struct osd_state *sd, -enum osd_win_layer osdwin) -{ - -osd_modify (sd,OSD_MISCCTL_BLDSEL ,0 ,OSD_MISCCTL ); -switch (osdwin) { -case OSDWIN_OSD0 : -osd_modify (sd,OSD_EXTMODE_OSD0BLDCHR , -OSD_EXTMODE_OSD0BLDCHR ,OSD_EXTMODE ); -break ; -case OSDWIN_OSD1 : -osd_modify (sd,OSD_EXTMODE_OSD1BLDCHR , -OSD_EXTMODE_OSD1BLDCHR ,OSD_EXTMODE ); -break ; - } -} - -static void _osd_enable_color_key (struct osd_state *sd, -enum osd_win_layer osdwin, -unsigned colorkey, -enum osd_pix_format pixfmt) -{ -switch (pixfmt) { -case PIXFMT_1BPP : -case PIXFMT_2BPP : -case PIXFMT_4BPP : -case PIXFMT_8BPP : -if (sd->vpbe_type ==VPBE_VERSION_3 ) { -switch (osdwin) { -case OSDWIN_OSD0 : -osd_modify (sd,OSD_TRANSPBMPIDX_BMP0 , - colorkey << -OSD_TRANSPBMPIDX_BMP0_SHIFT , -OSD_TRANSPBMPIDX ); -break ; -case OSDWIN_OSD1 : -osd_modify (sd,OSD_TRANSPBMPIDX_BMP1 , - colorkey << -OSD_TRANSPBMPIDX_BMP1_SHIFT , -OSD_TRANSPBMPIDX ); -break ; - } - } -break ; -case PIXFMT_RGB565 : -if (sd->vpbe_type ==VPBE_VERSION_1 ) -osd_write (sd, colorkey &OSD_TRANSPVAL_RGBTRANS , -OSD_TRANSPVAL ); -else if (sd->vpbe_type ==VPBE_VERSION_3 ) -osd_write (sd, colorkey &OSD_TRANSPVALL_RGBL , -OSD_TRANSPVALL ); -break ; -case PIXFMT_YCBCRI : -case PIXFMT_YCRCBI : -if (sd->vpbe_type ==VPBE_VERSION_3 ) -osd_modify (sd,OSD_TRANSPVALU_Y , colorkey, -OSD_TRANSPVALU ); -break ; -case PIXFMT_RGB888 : -if (sd->vpbe_type ==VPBE_VERSION_3 ) { -osd_write (sd, colorkey &OSD_TRANSPVALL_RGBL , -OSD_TRANSPVALL ); -osd_modify (sd,OSD_TRANSPVALU_RGBU , colorkey >>16 , -OSD_TRANSPVALU ); - } -break ; -default : -break ; - } - -switch (osdwin) { -case OSDWIN_OSD0 : -osd_set (sd,OSD_OSDWIN0MD_TE0 ,OSD_OSDWIN0MD ); -break ; -case OSDWIN_OSD1 : -osd_set (sd,OSD_OSDWIN1MD_TE1 ,OSD_OSDWIN1MD ); -break ; - } -} - -static void _osd_disable_color_key (struct osd_state *sd, -enum osd_win_layer osdwin) -{ -switch (osdwin) { -case OSDWIN_OSD0 : -osd_clear (sd,OSD_OSDWIN0MD_TE0 ,OSD_OSDWIN0MD ); -break ; -case OSDWIN_OSD1 : -osd_clear (sd,OSD_OSDWIN1MD_TE1 ,OSD_OSDWIN1MD ); -break ; - } -} - -static void _osd_set_osd_clut (struct osd_state *sd, -enum osd_win_layer osdwin, -enum osd_clut clut) -{ -u32 winmd =0 ; - -switch (osdwin) { -case OSDWIN_OSD0 : -if (clut ==RAM_CLUT ) - winmd |=OSD_OSDWIN0MD_CLUTS0 ; -osd_modify (sd,OSD_OSDWIN0MD_CLUTS0 , winmd,OSD_OSDWIN0MD ); -break ; -case OSDWIN_OSD1 : -if (clut ==RAM_CLUT ) - winmd |=OSD_OSDWIN1MD_CLUTS1 ; -osd_modify (sd,OSD_OSDWIN1MD_CLUTS1 , winmd,OSD_OSDWIN1MD ); -break ; - } -} - -static void _osd_set_zoom (struct osd_state *sd,enum osd_layer layer, -enum osd_zoom_factor h_zoom, -enum osd_zoom_factor v_zoom) -{ -u32 winmd =0 ; - -switch (layer) { -case WIN_OSD0 : - winmd |= (h_zoom <<OSD_OSDWIN0MD_OHZ0_SHIFT ); - winmd |= (v_zoom <<OSD_OSDWIN0MD_OVZ0_SHIFT ); -osd_modify (sd,OSD_OSDWIN0MD_OHZ0 |OSD_OSDWIN0MD_OVZ0 , winmd, -OSD_OSDWIN0MD ); -break ; -case WIN_VID0 : - winmd |= (h_zoom <<OSD_VIDWINMD_VHZ0_SHIFT ); - winmd |= (v_zoom <<OSD_VIDWINMD_VVZ0_SHIFT ); -osd_modify (sd,OSD_VIDWINMD_VHZ0 |OSD_VIDWINMD_VVZ0 , winmd, -OSD_VIDWINMD ); -break ; -case WIN_OSD1 : - winmd |= (h_zoom <<OSD_OSDWIN1MD_OHZ1_SHIFT ); - winmd |= (v_zoom <<OSD_OSDWIN1MD_OVZ1_SHIFT ); -osd_modify (sd,OSD_OSDWIN1MD_OHZ1 |OSD_OSDWIN1MD_OVZ1 , winmd, -OSD_OSDWIN1MD ); -break ; -case WIN_VID1 : - winmd |= (h_zoom <<OSD_VIDWINMD_VHZ1_SHIFT ); - winmd |= (v_zoom <<OSD_VIDWINMD_VVZ1_SHIFT ); -osd_modify (sd,OSD_VIDWINMD_VHZ1 |OSD_VIDWINMD_VVZ1 , winmd, -OSD_VIDWINMD ); -break ; - } -} - -static void _osd_disable_layer (struct osd_state *sd,enum osd_layer layer) -{ -switch (layer) { -case WIN_OSD0 : -osd_clear (sd,OSD_OSDWIN0MD_OACT0 ,OSD_OSDWIN0MD ); -break ; -case WIN_VID0 : -osd_clear (sd,OSD_VIDWINMD_ACT0 ,OSD_VIDWINMD ); -break ; -case WIN_OSD1 : -/* disable attribute mode as well as disabling the window */ -osd_clear (sd,OSD_OSDWIN1MD_OASW |OSD_OSDWIN1MD_OACT1 , -OSD_OSDWIN1MD ); -break ; -case WIN_VID1 : -osd_clear (sd,OSD_VIDWINMD_ACT1 ,OSD_VIDWINMD ); -break ; - } -} - -static void osd_disable_layer (struct osd_state *sd,enum osd_layer layer) -{ -struct osd_state *osd = sd; -struct osd_window_state *win = &osd->win[layer]; -unsigned long flags; - -spin_lock_irqsave (&osd->lock, flags); - -if (!win->is_enabled) { -spin_unlock_irqrestore (&osd->lock, flags); -return ; - } - win->is_enabled =0 ; - -_osd_disable_layer (sd, layer); - -spin_unlock_irqrestore (&osd->lock, flags); -} - -static void _osd_enable_attribute_mode (struct osd_state *sd) -{ -/* enable attribute mode for OSD1 */ -osd_set (sd,OSD_OSDWIN1MD_OASW ,OSD_OSDWIN1MD ); -} - -static void _osd_enable_layer (struct osd_state *sd,enum osd_layer layer) -{ -switch (layer) { -case WIN_OSD0 : -osd_set (sd,OSD_OSDWIN0MD_OACT0 ,OSD_OSDWIN0MD ); -break ; -case WIN_VID0 : -osd_set (sd,OSD_VIDWINMD_ACT0 ,OSD_VIDWINMD ); -break ; -case WIN_OSD1 : -/* enable OSD1 and disable attribute mode */ -osd_modify (sd,OSD_OSDWIN1MD_OASW |OSD_OSDWIN1MD_OACT1 , -OSD_OSDWIN1MD_OACT1 ,OSD_OSDWIN1MD );Lines of this file are not shown. View the raw message.
drivers/media/platform/ti/davinci/vpbe_osd_regs.h deleted +0
-352Lines of this file are not shown. View the raw message.
drivers/media/platform/ti/davinci/vpbe_venc.c deleted +0
-676Lines of this file are not shown. View the raw message.
drivers/media/platform/ti/davinci/vpbe_venc_regs.h deleted +0
-165Lines of this file are not shown. View the raw message.
drivers/media/platform/ti/davinci/vpss.c deleted +0
-529Lines of this file are not shown. View the raw message.
include/media/davinci/vpbe_display.h deleted +0
-122Lines of this file are not shown. View the raw message.
include/media/davinci/vpbe_osd.h deleted +0
-382Lines of this file are not shown. View the raw message.
include/media/davinci/vpbe_types.h deleted +0
-74Lines of this file are not shown. View the raw message.
include/media/davinci/vpbe_venc.h deleted +0
-37Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
Re: [PATCH 14/14] media: davinci: remove vpbe support
In reply to Arnd BergmannQuoted 8 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The davinci dm3xx/dm644x platforms are gone now, and the remaining da8xx platforms do not use the vpbe driver, so the driver can be removed as well.
Signed-off-by Arnd Bergmann <[email protected]>
Cheers,
Prabhakar
Quoted 10 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
As part of removing all board files that were previously marked as unused, I looked through the davinci platform and recursively removed everything that has now become unused.
In particular, this is for all dm3xx support, in addition to the dm64xx support removed previously. The remaining support is now for da8xx using devicetree only, which means a lot of the da8xx specific device support can also go away.
Kevin
Quoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
As part of removing all board files that were previously marked as unused, I looked through the davinci platform and recursively removed everything that has now become unused.
Quoted 6 lines
In particular, this is for all dm3xx support, in addition to the dm64xx support removed previously. The remaining support is now for da8xx using devicetree only, which means a lot of the da8xx specific device support can also go away.
[...]
Applied, thanks!
[08/14] rtc: remove davinci rtc driver
commit: 6274ef3c7eb5e9792a708c23757e16b444e4267f
Best regards,
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com