ARM: Merge next-simtec (c28d3bf3) · Commits · e / devices / android_kernel_fairphone_FP5

arch/arm/mach-s3c2410/include/mach/ts.h

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		/* linux/include/asm/arch-s3c2410/ts.h
		*
		* Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.org>
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*/

		#ifndef __ASM_ARM_TS_H
		#define __ASM_ARM_TS_H

		struct s3c2410_ts_mach_info {
		int delay;
		int presc;
		int oversampling_shift;
		};

		extern void s3c24xx_ts_set_platdata(struct s3c2410_ts_mach_info *);

		#endif /* __ASM_ARM_TS_H */

+3 −0

Original line number	Diff line number	Diff line
		@@ -279,6 +279,7 @@ static struct s3c2410_nand_set __initdata bast_nand_sets[] = {
		.name = "SmartMedia",
		.nr_chips = 1,
		.nr_map = smartmedia_map,
		.options = NAND_SCAN_SILENT_NODEV,
		.nr_partitions = ARRAY_SIZE(bast_default_nand_part),
		.partitions = bast_default_nand_part,
		},
		@@ -293,6 +294,7 @@ static struct s3c2410_nand_set __initdata bast_nand_sets[] = {
		.name = "chip1",
		.nr_chips = 1,
		.nr_map = chip1_map,
		.options = NAND_SCAN_SILENT_NODEV,
		.nr_partitions = ARRAY_SIZE(bast_default_nand_part),
		.partitions = bast_default_nand_part,
		},
		@@ -300,6 +302,7 @@ static struct s3c2410_nand_set __initdata bast_nand_sets[] = {
		.name = "chip2",
		.nr_chips = 1,
		.nr_map = chip2_map,
		.options = NAND_SCAN_SILENT_NODEV,
		.nr_partitions = ARRAY_SIZE(bast_default_nand_part),
		.partitions = bast_default_nand_part,
		}

+8 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@
		#include <mach/h1940.h>
		#include <mach/h1940-latch.h>
		#include <mach/fb.h>
		#include <mach/ts.h>
		#include <plat/udc.h>
		#include <plat/iic.h>

		@@ -140,6 +141,11 @@ static struct s3c2410_udc_mach_info h1940_udc_cfg __initdata = {
		.vbus_pin_inverted = 1,
		};

		static struct s3c2410_ts_mach_info h1940_ts_cfg __initdata = {
		.delay = 10000,
		.presc = 49,
		.oversampling_shift = 2,
		};

		/**
		* Set lcd on or off
		@@ -265,6 +271,7 @@ static struct platform_device h1940_lcd_powerdev = {
		};

		static struct platform_device *h1940_devices[] __initdata = {
		&s3c_device_ts,
		&s3c_device_usb,
		&s3c_device_lcd,
		&s3c_device_wdt,
		@@ -305,6 +312,7 @@ static void __init h1940_init(void)

		s3c24xx_fb_set_platdata(&h1940_fb_info);
		s3c24xx_udc_set_platdata(&h1940_udc_cfg);
		s3c24xx_ts_set_platdata(&h1940_ts_cfg);
		s3c_i2c0_set_platdata(NULL);

		s3c_device_sdi.dev.platform_data = &h1940_mmc_cfg;

+2 −0

Original line number	Diff line number	Diff line
		@@ -208,6 +208,7 @@ static struct s3c2410_nand_set __initdata osiris_nand_sets[] = {
		.name = "External",
		.nr_chips = 1,
		.nr_map = external_map,
		.options = NAND_SCAN_SILENT_NODEV,
		.nr_partitions = ARRAY_SIZE(osiris_default_nand_part),
		.partitions = osiris_default_nand_part,
		},
		@@ -222,6 +223,7 @@ static struct s3c2410_nand_set __initdata osiris_nand_sets[] = {
		.name = "chip1",
		.nr_chips = 1,
		.nr_map = chip1_map,
		.options = NAND_SCAN_SILENT_NODEV,
		.nr_partitions = ARRAY_SIZE(osiris_default_nand_part),
		.partitions = osiris_default_nand_part,
		},

+3 −1

Original line number	Diff line number	Diff line
		@@ -114,7 +114,7 @@ void __init s3c_nand_set_platdata(struct s3c2410_platform_nand *nand)

		for (i = 0; i < npd->nr_sets; i++) {
		ret = s3c_nand_copy_set(to);
		if (!ret) {
		if (ret) {
		printk(KERN_ERR "%s: failed to copy set %d\n",
		__func__, i);
		return;
		@@ -122,6 +122,8 @@ void __init s3c_nand_set_platdata(struct s3c2410_platform_nand *nand)
		to++;
		}
		}

		s3c_device_nand.dev.platform_data = npd;
		}

		EXPORT_SYMBOL_GPL(s3c_nand_set_platdata);