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

Commit 4d72cef1 authored by Alexander Clouter's avatar Alexander Clouter Committed by Andrew Lunn
Browse files

ARM: orion5x: ts78xx debugging changes 



Move to using a refined pr_fmt to avoid having to manually
prefix every message line with 'ts78xx'.

Changelog:
 v2: moved pr_fmt define ahead of includes as suggested by
	Hartley Sweeten to avoid use of leading undef
 v1: initial release

Signed-off-by: default avatarAlexander Clouter <alex@digriz.org.uk>
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
parent 4f8cf610

arch/arm/mach-orion5x/ts78xx-setup.c

+18 −16
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
 * warranty of any kind, whether express or implied.

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/sysfs.h>
@@ -141,10 +143,14 @@ static int ts78xx_ts_rtc_load(void) 
			} else

				rc = platform_device_add(&ts78xx_ts_rtc_device);



			if (rc)

				pr_info("RTC could not be registered: %d\n",

					rc);

			return rc;

		}

	}



	pr_info("RTC not found\n");

	return -ENODEV;

};
@@ -316,6 +322,8 @@ static int ts78xx_ts_nand_load(void) 
	} else

		rc = platform_device_add(&ts78xx_ts_nand_device);



	if (rc)

		pr_info("NAND could not be registered: %d\n", rc);

	return rc;

};
@@ -357,6 +365,8 @@ static int ts78xx_ts_rng_load(void) 
	} else

		rc = platform_device_add(&ts78xx_ts_rng_device);



	if (rc)

		pr_info("RNG could not be registered: %d\n", rc);

	return rc;

};
@@ -396,7 +406,7 @@ static void ts78xx_fpga_supports(void) 
		/* enable devices if magic matches */

		switch ((ts78xx_fpga.id >> 8) & 0xffffff) {

		case TS7800_FPGA_MAGIC:

			pr_warning("TS-7800 FPGA: unrecognized revision 0x%.2x\n",

			pr_warning("unrecognised FPGA revision 0x%.2x\n",

					ts78xx_fpga.id & 0xff);

			ts78xx_fpga.supports.ts_rtc.present = 1;

			ts78xx_fpga.supports.ts_nand.present = 1;
@@ -416,26 +426,20 @@ static int ts78xx_fpga_load_devices(void) 


	if (ts78xx_fpga.supports.ts_rtc.present == 1) {

		tmp = ts78xx_ts_rtc_load();

		if (tmp) {

			pr_info("TS-78xx: RTC not registered\n");

		if (tmp)

			ts78xx_fpga.supports.ts_rtc.present = 0;

		}

		ret |= tmp;

	}

	if (ts78xx_fpga.supports.ts_nand.present == 1) {

		tmp = ts78xx_ts_nand_load();

		if (tmp) {

			pr_info("TS-78xx: NAND not registered\n");

		if (tmp)

			ts78xx_fpga.supports.ts_nand.present = 0;

		}

		ret |= tmp;

	}

	if (ts78xx_fpga.supports.ts_rng.present == 1) {

		tmp = ts78xx_ts_rng_load();

		if (tmp) {

			pr_info("TS-78xx: RNG not registered\n");

		if (tmp)

			ts78xx_fpga.supports.ts_rng.present = 0;

		}

		ret |= tmp;

	}
@@ -460,7 +464,7 @@ static int ts78xx_fpga_load(void) 
{

	ts78xx_fpga.id = readl(TS78XX_FPGA_REGS_VIRT_BASE);



	pr_info("TS-78xx FPGA: magic=0x%.6x, rev=0x%.2x\n",

	pr_info("FPGA magic=0x%.6x, rev=0x%.2x\n",

			(ts78xx_fpga.id >> 8) & 0xffffff,

			ts78xx_fpga.id & 0xff);
@@ -488,7 +492,7 @@ static int ts78xx_fpga_unload(void) 
	 * UrJTAG SVN since r1381 can be used to reprogram the FPGA

	 */

	if (ts78xx_fpga.id != fpga_id) {

		pr_err("TS-78xx FPGA: magic/rev mismatch\n"

		pr_err("FPGA magic/rev mismatch\n"

			"TS-78xx FPGA: was 0x%.6x/%.2x but now 0x%.6x/%.2x\n",

			(ts78xx_fpga.id >> 8) & 0xffffff, ts78xx_fpga.id & 0xff,

			(fpga_id >> 8) & 0xffffff, fpga_id & 0xff);
@@ -519,7 +523,7 @@ static ssize_t ts78xx_fpga_store(struct kobject *kobj, 
	int value, ret;



	if (ts78xx_fpga.state < 0) {

		pr_err("TS-78xx FPGA: borked, you must powercycle asap\n");

		pr_err("FPGA borked, you must powercycle ASAP\n");

		return -EBUSY;

	}
@@ -527,10 +531,8 @@ static ssize_t ts78xx_fpga_store(struct kobject *kobj, 
		value = 1;

	else if (strncmp(buf, "offline", sizeof("offline") - 1) == 0)

		value = 0;

	else {

		pr_err("ts78xx_fpga_store: Invalid value\n");

	else

		return -EINVAL;

	}



	if (ts78xx_fpga.state == value)

		return n;