Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2fccdea authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-soc-4.9' of... 

Merge tag 'samsung-soc-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc

Merge "Samsung mach/soc update for v4.9" from Krzysztof Kozlowski:

1. Fix for DMA on S3C24xx. This was probably broken for long time, nobody runs
   this code... till now.
2. After fixes from Matthew Leach and Ben Dooks, most of our mach code
   and drivers is now endian-safe. Mark the platform as supporting big endian.
3. Cleanups.

* tag 'samsung-soc-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: EXYNOS: Remove unused DMC and CMU offsets and their mappings
  ARM: s3c64xx: Delete unnecessary assignment for the field "owner"
  ARM: EXYNOS: Enable ARCH_SUPPORTS_BIG_ENDIAN explicitly
  ARM: S3C24XX: Add missing DMA device for Mini2440 board
  ARM: S3C24XX: Add dma_mask assignments for DMA devices
parents 2fca8430 a3628975

arch/arm/mach-exynos/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ menuconfig ARCH_EXYNOS 
	depends on ARCH_MULTI_V7

	select ARCH_HAS_BANDGAP

	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_SUPPORTS_BIG_ENDIAN

	select ARM_AMBA

	select ARM_GIC

	select COMMON_CLK_SAMSUNG

arch/arm/mach-exynos/exynos.c

+0 −15
Original line number Diff line number Diff line
@@ -30,25 +30,10 @@ 


static struct map_desc exynos4_iodesc[] __initdata = {

	{

		.virtual	= (unsigned long)S5P_VA_CMU,

		.pfn		= __phys_to_pfn(EXYNOS4_PA_CMU),

		.length		= SZ_128K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)S5P_VA_COREPERI_BASE,

		.pfn		= __phys_to_pfn(EXYNOS4_PA_COREPERI),

		.length		= SZ_8K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)S5P_VA_DMC0,

		.pfn		= __phys_to_pfn(EXYNOS4_PA_DMC0),

		.length		= SZ_64K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)S5P_VA_DMC1,

		.pfn		= __phys_to_pfn(EXYNOS4_PA_DMC1),

		.length		= SZ_64K,

		.type		= MT_DEVICE,

	},

};

arch/arm/mach-exynos/include/mach/map.h

+0 −5
Original line number Diff line number Diff line
@@ -18,11 +18,6 @@ 


#define EXYNOS_PA_CHIPID		0x10000000



#define EXYNOS4_PA_CMU			0x10030000



#define EXYNOS4_PA_DMC0			0x10400000

#define EXYNOS4_PA_DMC1			0x10410000



#define EXYNOS4_PA_COREPERI		0x10500000



#endif /* __ASM_ARCH_MAP_H */

arch/arm/mach-s3c24xx/common.c

+15 −5
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

*/





#include <linux/dma-mapping.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/interrupt.h>
@@ -304,6 +304,8 @@ struct s3c24xx_uart_resources s3c2410_uart_resources[] __initdata = { 
	},

};



#define s3c24xx_device_dma_mask (*((u64[]) { DMA_BIT_MASK(32) }))



#if defined(CONFIG_CPU_S3C2410) || defined(CONFIG_CPU_S3C2412) || \

	defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2442)

static struct resource s3c2410_dma_resource[] = {
@@ -354,6 +356,8 @@ struct platform_device s3c2410_device_dma = { 
	.num_resources	= ARRAY_SIZE(s3c2410_dma_resource),

	.resource	= s3c2410_dma_resource,

	.dev	= {

		.dma_mask = &s3c24xx_device_dma_mask,

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.platform_data = &s3c2410_dma_platdata,

	},

};
@@ -395,6 +399,8 @@ struct platform_device s3c2412_device_dma = { 
	.num_resources	= ARRAY_SIZE(s3c2410_dma_resource),

	.resource	= s3c2410_dma_resource,

	.dev	= {

		.dma_mask = &s3c24xx_device_dma_mask,

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.platform_data = &s3c2412_dma_platdata,

	},

};
@@ -451,6 +457,8 @@ struct platform_device s3c2440_device_dma = { 
	.num_resources	= ARRAY_SIZE(s3c2410_dma_resource),

	.resource	= s3c2410_dma_resource,

	.dev	= {

		.dma_mask = &s3c24xx_device_dma_mask,

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.platform_data = &s3c2440_dma_platdata,

	},

};
@@ -503,6 +511,8 @@ struct platform_device s3c2443_device_dma = { 
	.num_resources	= ARRAY_SIZE(s3c2443_dma_resource),

	.resource	= s3c2443_dma_resource,

	.dev	= {

		.dma_mask = &s3c24xx_device_dma_mask,

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.platform_data = &s3c2443_dma_platdata,

	},

};

arch/arm/mach-s3c24xx/mach-mini2440.c

+1 −0
Original line number Diff line number Diff line
@@ -516,6 +516,7 @@ static struct platform_device *mini2440_devices[] __initdata = { 
	&mini2440_button_device,

	&s3c_device_nand,

	&s3c_device_sdi,

	&s3c2440_device_dma,

	&s3c_device_iis,

	&uda1340_codec,

	&mini2440_audio,