ARM: ux500: cut some platform data
Subsystems (3)
PATCH 1/1 ARM: ux500: cut some platform data
This platform data is revoked: the drivers are getting the DMA configuration from the device tree, it has been done like that since the DMA support was merged and this data has not been used since. The remaining auxdata is also unused.
---
ARM SoC folks: please apply this directly to the ux500/dev branch, or if you want some separate cleanup branch. I originally intended to send it along with other changes but those will land in v4.12 or something instead.
--- arch/arm/mach-ux500/board-mop500-audio.c | 77 ----------------------------- arch/arm/mach-ux500/board-mop500.h | 17 ------- arch/arm/mach-ux500/cpu-db8500.c | 16 ------ arch/arm/mach-ux500/ste-dma40-db8500.h | 85 -------------------------------- 4 files changed, 195 deletions(-) delete mode 100644 arch/arm/mach-ux500/board-mop500-audio.c delete mode 100644 arch/arm/mach-ux500/board-mop500.h delete mode 100644 arch/arm/mach-ux500/ste-dma40-db8500.h
arch/arm/mach-ux500/board-mop500-audio.c deleted +0 -77
@@ -1,77 +0,0 @@ -/* -* Copyright (C) ST-Ericsson SA 2010 -* -* License terms: GNU General Public License (GPL), version 2 -*/ - -#include <linux/platform_device.h> -#include <linux/init.h> -#include <linux/gpio.h> -#include <linux/platform_data/dma-ste-dma40.h> - -#include <linux/platform_data/asoc-ux500-msp.h> - -#include "ste-dma40-db8500.h" -#include "board-mop500.h" - -static struct stedma40_chan_cfg msp0_dma_rx = { - .high_priority = true, - .dir =DMA_DEV_TO_MEM , - .dev_type =DB8500_DMA_DEV31_MSP0_SLIM0_CH0 , -}; - -static struct stedma40_chan_cfg msp0_dma_tx = { - .high_priority = true, - .dir =DMA_MEM_TO_DEV , - .dev_type =DB8500_DMA_DEV31_MSP0_SLIM0_CH0 , -}; - -struct msp_i2s_platform_data msp0_platform_data = { - .id =0 , - .msp_i2s_dma_rx = &msp0_dma_rx, - .msp_i2s_dma_tx = &msp0_dma_tx, -}; - -static struct stedma40_chan_cfg msp1_dma_rx = { - .high_priority = true, - .dir =DMA_DEV_TO_MEM , - .dev_type =DB8500_DMA_DEV30_MSP3 , -}; - -static struct stedma40_chan_cfg msp1_dma_tx = { - .high_priority = true, - .dir =DMA_MEM_TO_DEV , - .dev_type =DB8500_DMA_DEV30_MSP1 , -}; - -struct msp_i2s_platform_data msp1_platform_data = { - .id =1 , - .msp_i2s_dma_rx =NULL , - .msp_i2s_dma_tx = &msp1_dma_tx, -}; - -static struct stedma40_chan_cfg msp2_dma_rx = { - .high_priority = true, - .dir =DMA_DEV_TO_MEM , - .dev_type =DB8500_DMA_DEV14_MSP2 , -}; - -static struct stedma40_chan_cfg msp2_dma_tx = { - .high_priority = true, - .dir =DMA_MEM_TO_DEV , - .dev_type =DB8500_DMA_DEV14_MSP2 , - .use_fixed_channel = true, - .phy_channel =1 , -}; - -struct msp_i2s_platform_data msp2_platform_data = { - .id =2 , - .msp_i2s_dma_rx = &msp2_dma_rx, - .msp_i2s_dma_tx = &msp2_dma_tx, -}; - -struct msp_i2s_platform_data msp3_platform_data = { - .id =3 , - .msp_i2s_dma_rx = &msp1_dma_rx, - .msp_i2s_dma_tx =NULL , -};
arch/arm/mach-ux500/board-mop500.h deleted +0 -17
@@ -1,17 +0,0 @@ -/* -* Copyright (C) ST-Ericsson SA 2010 -* -* License terms: GNU General Public License (GPL) version 2 -*/ - -#ifndef __BOARD_MOP500_H -#define __BOARD_MOP500_H - -#include <linux/platform_data/asoc-ux500-msp.h> - -extern struct msp_i2s_platform_data msp0_platform_data; -extern struct msp_i2s_platform_data msp1_platform_data; -extern struct msp_i2s_platform_data msp2_platform_data; -extern struct msp_i2s_platform_data msp3_platform_data; - -#endif
arch/arm/mach-ux500/cpu-db8500.c +0 -16
@@ -33,7 +33,6 @@#include "setup.h" -#include "board-mop500.h" #include "db8500-regs.h" static int __init ux500_l2x0_unlock (void )
@@ -141,21 +140,6 @@ static struct arm_pmu_platdata db8500_pmu_platdata = {static struct of_dev_auxdata u8500_auxdata_lookup[]__initdata = {/* Requires call-back bindings. */ OF_DEV_AUXDATA ("arm,cortex-a9-pmu" ,0 ,"arm-pmu" , &db8500_pmu_platdata), -/* Requires DMA bindings. */ -OF_DEV_AUXDATA ("stericsson,ux500-msp-i2s" ,0x80123000 , -"ux500-msp-i2s.0" , &msp0_platform_data), -OF_DEV_AUXDATA ("stericsson,ux500-msp-i2s" ,0x80124000 , -"ux500-msp-i2s.1" , &msp1_platform_data), -OF_DEV_AUXDATA ("stericsson,ux500-msp-i2s" ,0x80117000 , -"ux500-msp-i2s.2" , &msp2_platform_data), -OF_DEV_AUXDATA ("stericsson,ux500-msp-i2s" ,0x80125000 , -"ux500-msp-i2s.3" , &msp3_platform_data), -/* Requires non-DT:able platform data. */ -OF_DEV_AUXDATA ("stericsson,db8500-prcmu" ,0x80157000 ,"db8500-prcmu" ,NULL ), -OF_DEV_AUXDATA ("stericsson,ux500-cryp" ,0xa03cb000 ,"cryp1" ,NULL ), -OF_DEV_AUXDATA ("stericsson,ux500-hash" ,0xa03c2000 ,"hash1" ,NULL ), -OF_DEV_AUXDATA ("stericsson,snd-soc-mop500" ,0 ,"snd-soc-mop500.0" , -NULL ), {}, };
arch/arm/mach-ux500/ste-dma40-db8500.h deleted +0 -85
85 lines not on this page · raw message
Signature · 1 line
2.9.3
Arnd Bergmann
AppliedPATCH 1/1 ARM: ux500: cut some platform data
Quoted 12 lines · CET Linus Walleij
This platform data is revoked: the drivers are getting the DMA configuration from the device tree, it has been done like that since the DMA support was merged and this data has not been used since. The remaining auxdata is also unused.
Acked-by Arnd Bergmann <[email protected]>Signed-off-by Linus Walleij <[email protected]>---
ARM SoC folks: please apply this directly to the ux500/dev branch, or if you want some separate cleanup branch. I originally intended to send it along with other changes but those will land in v4.12 or something instead.
Quoted 9 lines
--- arch/arm/mach-ux500/board-mop500-audio.c | 77 ----------------------------- arch/arm/mach-ux500/board-mop500.h | 17 ------- arch/arm/mach-ux500/cpu-db8500.c | 16 ------ arch/arm/mach-ux500/ste-dma40-db8500.h | 85 -------------------------------- 4 files changed, 195 deletions(-) delete mode 100644 arch/arm/mach-ux500/board-mop500-audio.c delete mode 100644 arch/arm/mach-ux500/board-mop500.h delete mode 100644 arch/arm/mach-ux500/ste-dma40-db8500.h
Applied to next/soc, thanks!
Arnd
PATCH 1/1 ARM: ux500: cut some platform data
Quoted 23 lines · Arnd Bergmann
Quoted 12 lines · CET Linus Walleij
This platform data is revoked: the drivers are getting the DMA configuration from the device tree, it has been done like that since the DMA support was merged and this data has not been used since. The remaining auxdata is also unused.
Acked-by Arnd Bergmann <[email protected]>Signed-off-by Linus Walleij <[email protected]>---
ARM SoC folks: please apply this directly to the ux500/dev branch, or if you want some separate cleanup branch. I originally intended to send it along with other changes but those will land in v4.12 or something instead.Quoted 9 lines
--- arch/arm/mach-ux500/board-mop500-audio.c | 77 ----------------------------- arch/arm/mach-ux500/board-mop500.h | 17 ------- arch/arm/mach-ux500/cpu-db8500.c | 16 ------ arch/arm/mach-ux500/ste-dma40-db8500.h | 85 -------------------------------- 4 files changed, 195 deletions(-) delete mode 100644 arch/arm/mach-ux500/board-mop500-audio.c delete mode 100644 arch/arm/mach-ux500/board-mop500.h delete mode 100644 arch/arm/mach-ux500/ste-dma40-db8500.h
Quoted 1 line
Applied to next/soc, thanks!
Linus,
Looks like you missed to update the Makefile:
http://arm-soc.lixom.net/buildlogs/arm-soc/v4.10-rc5-794-gf8777f3/buildall.arm.allmodconfig.log.failed
I'll fix up in our tree, no need to send a patch.
-Olof
PATCH 1/1 ARM: ux500: cut some platform data
Quoted 24 lines · Olof Johansson
Quoted 23 lines · Arnd Bergmann
Quoted 21 lines · CET Linus Walleij
This platform data is revoked: the drivers are getting the DMA configuration from the device tree, it has been done like that since the DMA support was merged and this data has not been used since. The remaining auxdata is also unused.
Acked-by Arnd Bergmann <[email protected]>Signed-off-by Linus Walleij <[email protected]>---
ARM SoC folks: please apply this directly to the ux500/dev branch, or if you want some separate cleanup branch. I originally intended to send it along with other changes but those will land in v4.12 or something instead.--- arch/arm/mach-ux500/board-mop500-audio.c | 77 ----------------------------- arch/arm/mach-ux500/board-mop500.h | 17 ------- arch/arm/mach-ux500/cpu-db8500.c | 16 ------ arch/arm/mach-ux500/ste-dma40-db8500.h | 85 -------------------------------- 4 files changed, 195 deletions(-) delete mode 100644 arch/arm/mach-ux500/board-mop500-audio.c delete mode 100644 arch/arm/mach-ux500/board-mop500.h delete mode 100644 arch/arm/mach-ux500/ste-dma40-db8500.h
Quoted 6 lines
Quoted 1 line
Applied to next/soc, thanks!
Linus,
Looks like you missed to update the
Makefile:
http://arm-soc.lixom.net/buildlogs/arm-soc/v4.10-rc5-794-gf8777f3/buildall.arm.allmodconfig.log.failed
Ah, it's one of those missed by a dirty work tree.
I pushed it to kernelorg but apparently the autobuild isn't on in this tree...
Quoted 1 line
I'll fix up in our tree, no need to send a patch.
Thanks a lot!
Yours,
Linus Walleij