MIPS: AR7: Whitespace hacking (4d1da8c2) · Commits · e / devices / android_kernel_xiaomi_markw

arch/mips/ar7/memory.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -62,8 +62,7 @@ void __init prom_meminit(void)
	unsigned long pages;		unsigned long pages;

	pages = memsize() >> PAGE_SHIFT;		pages = memsize() >> PAGE_SHIFT;
	add_memory_region(PHYS_OFFSET, pages << PAGE_SHIFT,		add_memory_region(PHYS_OFFSET, pages << PAGE_SHIFT, BOOT_MEM_RAM);
	BOOT_MEM_RAM);
	}		}

	void __init prom_free_prom_memory(void)		void __init prom_free_prom_memory(void)

arch/mips/ar7/platform.c

+307 −280

Original line number	Original line	Diff line number	Diff line
	@@ -42,39 +42,42 @@
	#include <asm/mach-ar7/gpio.h>		#include <asm/mach-ar7/gpio.h>
	#include <asm/mach-ar7/prom.h>		#include <asm/mach-ar7/prom.h>

			/*****************************************************************************
			* VLYNQ Bus
			****************************************************************************/
	struct plat_vlynq_data {		struct plat_vlynq_data {
	struct plat_vlynq_ops ops;		struct plat_vlynq_ops ops;
	int gpio_bit;		int gpio_bit;
	int reset_bit;		int reset_bit;
	};		};


	static int vlynq_on(struct vlynq_device *dev)		static int vlynq_on(struct vlynq_device *dev)
	{		{
	int result;		int ret;
	struct plat_vlynq_data *pdata = dev->dev.platform_data;		struct plat_vlynq_data *pdata = dev->dev.platform_data;

	result = gpio_request(pdata->gpio_bit, "vlynq");		ret = gpio_request(pdata->gpio_bit, "vlynq");
	if (result)		if (ret)
	goto out;		goto out;

	ar7_device_reset(pdata->reset_bit);		ar7_device_reset(pdata->reset_bit);

	result = ar7_gpio_disable(pdata->gpio_bit);		ret = ar7_gpio_disable(pdata->gpio_bit);
	if (result)		if (ret)
	goto out_enabled;		goto out_enabled;

	result = ar7_gpio_enable(pdata->gpio_bit);		ret = ar7_gpio_enable(pdata->gpio_bit);
	if (result)		if (ret)
	goto out_enabled;		goto out_enabled;

	result = gpio_direction_output(pdata->gpio_bit, 0);		ret = gpio_direction_output(pdata->gpio_bit, 0);
	if (result)		if (ret)
	goto out_gpio_enabled;		goto out_gpio_enabled;

	msleep(50);		msleep(50);

	gpio_set_value(pdata->gpio_bit, 1);		gpio_set_value(pdata->gpio_bit, 1);

	msleep(50);		msleep(50);

	return 0;		return 0;
	@@ -85,54 +88,18 @@ out_enabled:
	ar7_device_disable(pdata->reset_bit);		ar7_device_disable(pdata->reset_bit);
	gpio_free(pdata->gpio_bit);		gpio_free(pdata->gpio_bit);
	out:		out:
	return result;		return ret;
	}		}

	static void vlynq_off(struct vlynq_device *dev)		static void vlynq_off(struct vlynq_device *dev)
	{		{
	struct plat_vlynq_data *pdata = dev->dev.platform_data;		struct plat_vlynq_data *pdata = dev->dev.platform_data;

	ar7_gpio_disable(pdata->gpio_bit);		ar7_gpio_disable(pdata->gpio_bit);
	gpio_free(pdata->gpio_bit);		gpio_free(pdata->gpio_bit);
	ar7_device_disable(pdata->reset_bit);		ar7_device_disable(pdata->reset_bit);
	}		}

	static struct resource physmap_flash_resource = {
	.name = "mem",
	.flags = IORESOURCE_MEM,
	.start = 0x10000000,
	.end = 0x107fffff,
	};

	static struct resource cpmac_low_res[] = {
	{
	.name = "regs",
	.flags = IORESOURCE_MEM,
	.start = AR7_REGS_MAC0,
	.end = AR7_REGS_MAC0 + 0x7ff,
	},
	{
	.name = "irq",
	.flags = IORESOURCE_IRQ,
	.start = 27,
	.end = 27,
	},
	};

	static struct resource cpmac_high_res[] = {
	{
	.name = "regs",
	.flags = IORESOURCE_MEM,
	.start = AR7_REGS_MAC1,
	.end = AR7_REGS_MAC1 + 0x7ff,
	},
	{
	.name = "irq",
	.flags = IORESOURCE_IRQ,
	.start = 41,
	.end = 41,
	},
	};

	static struct resource vlynq_low_res[] = {		static struct resource vlynq_low_res[] = {
	{		{
	.name = "regs",		.name = "regs",
	@@ -187,29 +154,98 @@ static struct resource vlynq_high_res[] = {
	},		},
	};		};

	static struct resource usb_res[] = {		static struct plat_vlynq_data vlynq_low_data = {
			.ops = {
			.on = vlynq_on,
			.off = vlynq_off,
			},
			.reset_bit = 20,
			.gpio_bit = 18,
			};

			static struct plat_vlynq_data vlynq_high_data = {
			.ops = {
			.on = vlynq_on,
			.off = vlynq_off,
			},
			.reset_bit = 26,
			.gpio_bit = 19,
			};

			static struct platform_device vlynq_low = {
			.id = 0,
			.name = "vlynq",
			.dev = {
			.platform_data = &vlynq_low_data,
			},
			.resource = vlynq_low_res,
			.num_resources = ARRAY_SIZE(vlynq_low_res),
			};

			static struct platform_device vlynq_high = {
			.id = 1,
			.name = "vlynq",
			.dev = {
			.platform_data = &vlynq_high_data,
			},
			.resource = vlynq_high_res,
			.num_resources = ARRAY_SIZE(vlynq_high_res),
			};

			/*****************************************************************************
			* Flash
			****************************************************************************/
			static struct resource physmap_flash_resource = {
			.name = "mem",
			.flags = IORESOURCE_MEM,
			.start = 0x10000000,
			.end = 0x107fffff,
			};

			static struct physmap_flash_data physmap_flash_data = {
			.width = 2,
			};

			static struct platform_device physmap_flash = {
			.name = "physmap-flash",
			.dev = {
			.platform_data = &physmap_flash_data,
			},
			.resource = &physmap_flash_resource,
			.num_resources = 1,
			};

			/*****************************************************************************
			* Ethernet
			****************************************************************************/
			static struct resource cpmac_low_res[] = {
	{		{
	.name = "regs",		.name = "regs",
	.flags = IORESOURCE_MEM,		.flags = IORESOURCE_MEM,
	.start = AR7_REGS_USB,		.start = AR7_REGS_MAC0,
	.end = AR7_REGS_USB + 0xff,		.end = AR7_REGS_MAC0 + 0x7ff,
	},		},
	{		{
	.name = "irq",		.name = "irq",
	.flags = IORESOURCE_IRQ,		.flags = IORESOURCE_IRQ,
	.start = 32,		.start = 27,
	.end = 32,		.end = 27,
	},		},
			};

			static struct resource cpmac_high_res[] = {
	{		{
	.name = "mem",		.name = "regs",
	.flags = IORESOURCE_MEM,		.flags = IORESOURCE_MEM,
	.start = 0x03400000,		.start = AR7_REGS_MAC1,
	.end = 0x03401fff,		.end = AR7_REGS_MAC1 + 0x7ff,
			},
			{
			.name = "irq",
			.flags = IORESOURCE_IRQ,
			.start = 41,
			.end = 41,
	},		},
	};

	static struct physmap_flash_data physmap_flash_data = {
	.width = 2,
	};		};

	static struct fixed_phy_status fixed_phy_status __initdata = {		static struct fixed_phy_status fixed_phy_status __initdata = {
	@@ -230,29 +266,8 @@ static struct plat_cpmac_data cpmac_high_data = {
	.phy_mask = 0x7fffffff,		.phy_mask = 0x7fffffff,
	};		};

	static struct plat_vlynq_data vlynq_low_data = {
	.ops.on = vlynq_on,
	.ops.off = vlynq_off,
	.reset_bit = 20,
	.gpio_bit = 18,
	};

	static struct plat_vlynq_data vlynq_high_data = {
	.ops.on = vlynq_on,
	.ops.off = vlynq_off,
	.reset_bit = 16,
	.gpio_bit = 19,
	};

	static struct platform_device physmap_flash = {
	.id = 0,
	.name = "physmap-flash",
	.dev.platform_data = &physmap_flash_data,
	.resource = &physmap_flash_resource,
	.num_resources = 1,
	};

	static u64 cpmac_dma_mask = DMA_BIT_MASK(32);		static u64 cpmac_dma_mask = DMA_BIT_MASK(32);

	static struct platform_device cpmac_low = {		static struct platform_device cpmac_low = {
	.id = 0,		.id = 0,
	.name = "cpmac",		.name = "cpmac",
	@@ -277,23 +292,75 @@ static struct platform_device cpmac_high = {
	.num_resources = ARRAY_SIZE(cpmac_high_res),		.num_resources = ARRAY_SIZE(cpmac_high_res),
	};		};

	static struct platform_device vlynq_low = {		static inline unsigned char char2hex(char h)
	.id = 0,		{
	.name = "vlynq",		switch (h) {
	.dev.platform_data = &vlynq_low_data,		case '0': case '1': case '2': case '3': case '4':
	.resource = vlynq_low_res,		case '5': case '6': case '7': case '8': case '9':
	.num_resources = ARRAY_SIZE(vlynq_low_res),		return h - '0';
	};		case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
			return h - 'A' + 10;
			case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
			return h - 'a' + 10;
			default:
			return 0;
			}
			}

	static struct platform_device vlynq_high = {		static void cpmac_get_mac(int instance, unsigned char *dev_addr)
	.id = 1,		{
	.name = "vlynq",		int i;
	.dev.platform_data = &vlynq_high_data,		char name[5], default_mac[ETH_ALEN], *mac;
	.resource = vlynq_high_res,
	.num_resources = ARRAY_SIZE(vlynq_high_res),		mac = NULL;
			sprintf(name, "mac%c", 'a' + instance);
			mac = prom_getenv(name);
			if (!mac) {
			sprintf(name, "mac%c", 'a');
			mac = prom_getenv(name);
			}
			if (!mac) {
			random_ether_addr(default_mac);
			mac = default_mac;
			}
			for (i = 0; i < 6; i++)
			dev_addr[i] = (char2hex(mac[i * 3]) << 4) +
			char2hex(mac[i * 3 + 1]);
			}

			/*****************************************************************************
			* USB
			****************************************************************************/
			static struct resource usb_res[] = {
			{
			.name = "regs",
			.flags = IORESOURCE_MEM,
			.start = AR7_REGS_USB,
			.end = AR7_REGS_USB + 0xff,
			},
			{
			.name = "irq",
			.flags = IORESOURCE_IRQ,
			.start = 32,
			.end = 32,
			},
			{
			.name = "mem",
			.flags = IORESOURCE_MEM,
			.start = 0x03400000,
			.end = 0x034001fff,
			},
	};		};

			static struct platform_device ar7_udc = {
			.name = "ar7_udc",
			.resource = usb_res,
			.num_resources = ARRAY_SIZE(usb_res),
			};

			/*****************************************************************************
			* LEDs
			****************************************************************************/
	static struct gpio_led default_leds[] = {		static struct gpio_led default_leds[] = {
	{		{
	.name = "status",		.name = "status",
	@@ -406,69 +473,11 @@ static struct gpio_led_platform_data ar7_led_data;

	static struct platform_device ar7_gpio_leds = {		static struct platform_device ar7_gpio_leds = {
	.name = "leds-gpio",		.name = "leds-gpio",
	.id = -1,
	.dev = {		.dev = {
	.platform_data = &ar7_led_data,		.platform_data = &ar7_led_data,
	}		}
	};		};

	static struct platform_device ar7_udc = {
	.id = -1,
	.name = "ar7_udc",
	.resource = usb_res,
	.num_resources = ARRAY_SIZE(usb_res),
	};

	static struct resource ar7_wdt_res = {
	.name = "regs",
	.start = -1, /* Filled at runtime */
	.end = -1, /* Filled at runtime */
	.flags = IORESOURCE_MEM,
	};

	static struct platform_device ar7_wdt = {
	.id = -1,
	.name = "ar7_wdt",
	.resource = &ar7_wdt_res,
	.num_resources = 1,
	};

	static inline unsigned char char2hex(char h)
	{
	switch (h) {
	case '0': case '1': case '2': case '3': case '4':
	case '5': case '6': case '7': case '8': case '9':
	return h - '0';
	case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
	return h - 'A' + 10;
	case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
	return h - 'a' + 10;
	default:
	return 0;
	}
	}

	static void cpmac_get_mac(int instance, unsigned char *dev_addr)
	{
	int i;
	char name[5], default_mac[ETH_ALEN], *mac;

	mac = NULL;
	sprintf(name, "mac%c", 'a' + instance);
	mac = prom_getenv(name);
	if (!mac) {
	sprintf(name, "mac%c", 'a');
	mac = prom_getenv(name);
	}
	if (!mac) {
	random_ether_addr(default_mac);
	mac = default_mac;
	}
	for (i = 0; i < 6; i++)
	dev_addr[i] = (char2hex(mac[i * 3]) << 4) +
	char2hex(mac[i * 3 + 1]);
	}

	static void __init detect_leds(void)		static void __init detect_leds(void)
	{		{
	char prid, usb_prod;		char prid, usb_prod;
	@@ -501,6 +510,25 @@ static void __init detect_leds(void)
	}		}
	}		}

			/*****************************************************************************
			* Watchdog
			****************************************************************************/
			static struct resource ar7_wdt_res = {
			.name = "regs",
			.flags = IORESOURCE_MEM,
			.start = -1, /* Filled at runtime */
			.end = -1, /* Filled at runtime */
			};

			static struct platform_device ar7_wdt = {
			.name = "ar7_wdt",
			.resource = &ar7_wdt_res,
			.num_resources = 1,
			};

			/*****************************************************************************
			* Init
			****************************************************************************/
	static int __init ar7_register_devices(void)		static int __init ar7_register_devices(void)
	{		{
	u16 chip_id;		u16 chip_id;
	@@ -528,7 +556,6 @@ static int __init ar7_register_devices(void)
	if (res)		if (res)
	return res;		return res;


	/* Only TNETD73xx have a second serial port */		/* Only TNETD73xx have a second serial port */
	if (ar7_has_second_uart()) {		if (ar7_has_second_uart()) {
	uart_port[1].type = PORT_16550A;		uart_port[1].type = PORT_16550A;

arch/mips/ar7/prom.c

+25 −23

Original line number	Original line	Diff line number	Diff line
	@@ -41,6 +41,7 @@ static struct env_var adam2_env[MAX_ENTRY];
	char prom_getenv(const char name)		char prom_getenv(const char name)
	{		{
	int i;		int i;

	for (i = 0; (i < MAX_ENTRY) && adam2_env[i].name; i++)		for (i = 0; (i < MAX_ENTRY) && adam2_env[i].name; i++)
	if (!strcmp(name, adam2_env[i].name))		if (!strcmp(name, adam2_env[i].name))
	return adam2_env[i].value;		return adam2_env[i].value;
	@@ -139,6 +140,7 @@ static char * __init lookup_psp_var_map(u8 num)
	static void __init add_adam2_var(char name, char value)		static void __init add_adam2_var(char name, char value)
	{		{
	int i;		int i;

	for (i = 0; i < MAX_ENTRY; i++) {		for (i = 0; i < MAX_ENTRY; i++) {
	if (!adam2_env[i].name) {		if (!adam2_env[i].name) {
	adam2_env[i].name = name;		adam2_env[i].name = name;

arch/mips/ar7/setup.c

+7 −8

Original line number	Original line	Diff line number	Diff line
	@@ -26,8 +26,8 @@

	static void ar7_machine_restart(char *command)		static void ar7_machine_restart(char *command)
	{		{
	u32 *softres_reg = ioremap(AR7_REGS_RESET +		u32 *softres_reg = ioremap(AR7_REGS_RESET + AR7_RESET_SOFTWARE, 1);
	AR7_RESET_SOFTWARE, 1);
	writel(1, softres_reg);		writel(1, softres_reg);
	}		}

	@@ -41,6 +41,7 @@ static void ar7_machine_power_off(void)
	{		{
	u32 power_reg = (u32 )ioremap(AR7_REGS_POWER, 1);		u32 power_reg = (u32 )ioremap(AR7_REGS_POWER, 1);
	u32 power_state = readl(power_reg) \| (3 << 30);		u32 power_state = readl(power_reg) \| (3 << 30);

	writel(power_state, power_reg);		writel(power_state, power_reg);
	ar7_machine_halt();		ar7_machine_halt();
	}		}
	@@ -49,14 +50,14 @@ const char *get_system_type(void)
	{		{
	u16 chip_id = ar7_chip_id();		u16 chip_id = ar7_chip_id();
	switch (chip_id) {		switch (chip_id) {
	case AR7_CHIP_7300:
	return "TI AR7 (TNETD7300)";
	case AR7_CHIP_7100:		case AR7_CHIP_7100:
	return "TI AR7 (TNETD7100)";		return "TI AR7 (TNETD7100)";
	case AR7_CHIP_7200:		case AR7_CHIP_7200:
	return "TI AR7 (TNETD7200)";		return "TI AR7 (TNETD7200)";
			case AR7_CHIP_7300:
			return "TI AR7 (TNETD7300)";
	default:		default:
	return "TI AR7 (Unknown)";		return "TI AR7 (unknown)";
	}		}
	}		}

	@@ -70,7 +71,6 @@ console_initcall(ar7_init_console);
	* Initializes basic routines and structures pointers, memory size (as		* Initializes basic routines and structures pointers, memory size (as
	* given by the bios and saves the command line.		* given by the bios and saves the command line.
	*/		*/

	void __init plat_mem_setup(void)		void __init plat_mem_setup(void)
	{		{
	unsigned long io_base;		unsigned long io_base;
	@@ -88,6 +88,5 @@ void __init plat_mem_setup(void)
	prom_meminit();		prom_meminit();

	printk(KERN_INFO "%s, ID: 0x%04x, Revision: 0x%02x\n",		printk(KERN_INFO "%s, ID: 0x%04x, Revision: 0x%02x\n",
	get_system_type(),		get_system_type(), ar7_chip_id(), ar7_chip_rev());
	ar7_chip_id(), ar7_chip_rev());
	}		}

arch/mips/ar7/gpio.c

+3 −3

File changed.

Contains only whitespace changes.