Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc (8b0eacca) · Commits · e / devices / android_kernel_oneplus_sm7250

Documentation/powerpc/mpc52xx-device-tree-bindings.txt

+2 −2

arch/powerpc/boot/dts/lite5200.dts

+9 −17

Original line number	Original line	Diff line number	Diff line
	@@ -70,18 +70,16 @@
	};		};

	gpt@600 { // General Purpose Timer		gpt@600 { // General Purpose Timer
	compatible = "mpc5200-gpt";		compatible = "fsl,mpc5200-gpt";
	device_type = "gpt";
	cell-index = <0>;		cell-index = <0>;
	reg = <600 10>;		reg = <600 10>;
	interrupts = <1 9 0>;		interrupts = <1 9 0>;
	interrupt-parent = <&mpc5200_pic>;		interrupt-parent = <&mpc5200_pic>;
	has-wdt;		fsl,has-wdt;
	};		};

	gpt@610 { // General Purpose Timer		gpt@610 { // General Purpose Timer
	compatible = "mpc5200-gpt";		compatible = "fsl,mpc5200-gpt";
	device_type = "gpt";
	cell-index = <1>;		cell-index = <1>;
	reg = <610 10>;		reg = <610 10>;
	interrupts = <1 a 0>;		interrupts = <1 a 0>;
	@@ -89,8 +87,7 @@
	};		};

	gpt@620 { // General Purpose Timer		gpt@620 { // General Purpose Timer
	compatible = "mpc5200-gpt";		compatible = "fsl,mpc5200-gpt";
	device_type = "gpt";
	cell-index = <2>;		cell-index = <2>;
	reg = <620 10>;		reg = <620 10>;
	interrupts = <1 b 0>;		interrupts = <1 b 0>;
	@@ -98,8 +95,7 @@
	};		};

	gpt@630 { // General Purpose Timer		gpt@630 { // General Purpose Timer
	compatible = "mpc5200-gpt";		compatible = "fsl,mpc5200-gpt";
	device_type = "gpt";
	cell-index = <3>;		cell-index = <3>;
	reg = <630 10>;		reg = <630 10>;
	interrupts = <1 c 0>;		interrupts = <1 c 0>;
	@@ -107,8 +103,7 @@
	};		};

	gpt@640 { // General Purpose Timer		gpt@640 { // General Purpose Timer
	compatible = "mpc5200-gpt";		compatible = "fsl,mpc5200-gpt";
	device_type = "gpt";
	cell-index = <4>;		cell-index = <4>;
	reg = <640 10>;		reg = <640 10>;
	interrupts = <1 d 0>;		interrupts = <1 d 0>;
	@@ -116,8 +111,7 @@
	};		};

	gpt@650 { // General Purpose Timer		gpt@650 { // General Purpose Timer
	compatible = "mpc5200-gpt";		compatible = "fsl,mpc5200-gpt";
	device_type = "gpt";
	cell-index = <5>;		cell-index = <5>;
	reg = <650 10>;		reg = <650 10>;
	interrupts = <1 e 0>;		interrupts = <1 e 0>;
	@@ -125,8 +119,7 @@
	};		};

	gpt@660 { // General Purpose Timer		gpt@660 { // General Purpose Timer
	compatible = "mpc5200-gpt";		compatible = "fsl,mpc5200-gpt";
	device_type = "gpt";
	cell-index = <6>;		cell-index = <6>;
	reg = <660 10>;		reg = <660 10>;
	interrupts = <1 f 0>;		interrupts = <1 f 0>;
	@@ -134,8 +127,7 @@
	};		};

	gpt@670 { // General Purpose Timer		gpt@670 { // General Purpose Timer
	compatible = "mpc5200-gpt";		compatible = "fsl,mpc5200-gpt";
	device_type = "gpt";
	cell-index = <7>;		cell-index = <7>;
	reg = <670 10>;		reg = <670 10>;
	interrupts = <1 10 0>;		interrupts = <1 10 0>;

arch/powerpc/boot/dts/lite5200b.dts

+9 −17

Original line number	Original line	Diff line number	Diff line
	@@ -70,18 +70,16 @@
	};		};

	gpt@600 { // General Purpose Timer		gpt@600 { // General Purpose Timer
	compatible = "mpc5200b-gpt","mpc5200-gpt";		compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
	device_type = "gpt";
	cell-index = <0>;		cell-index = <0>;
	reg = <600 10>;		reg = <600 10>;
	interrupts = <1 9 0>;		interrupts = <1 9 0>;
	interrupt-parent = <&mpc5200_pic>;		interrupt-parent = <&mpc5200_pic>;
	has-wdt;		fsl,has-wdt;
	};		};

	gpt@610 { // General Purpose Timer		gpt@610 { // General Purpose Timer
	compatible = "mpc5200b-gpt","mpc5200-gpt";		compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
	device_type = "gpt";
	cell-index = <1>;		cell-index = <1>;
	reg = <610 10>;		reg = <610 10>;
	interrupts = <1 a 0>;		interrupts = <1 a 0>;
	@@ -89,8 +87,7 @@
	};		};

	gpt@620 { // General Purpose Timer		gpt@620 { // General Purpose Timer
	compatible = "mpc5200b-gpt","mpc5200-gpt";		compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
	device_type = "gpt";
	cell-index = <2>;		cell-index = <2>;
	reg = <620 10>;		reg = <620 10>;
	interrupts = <1 b 0>;		interrupts = <1 b 0>;
	@@ -98,8 +95,7 @@
	};		};

	gpt@630 { // General Purpose Timer		gpt@630 { // General Purpose Timer
	compatible = "mpc5200b-gpt","mpc5200-gpt";		compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
	device_type = "gpt";
	cell-index = <3>;		cell-index = <3>;
	reg = <630 10>;		reg = <630 10>;
	interrupts = <1 c 0>;		interrupts = <1 c 0>;
	@@ -107,8 +103,7 @@
	};		};

	gpt@640 { // General Purpose Timer		gpt@640 { // General Purpose Timer
	compatible = "mpc5200b-gpt","mpc5200-gpt";		compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
	device_type = "gpt";
	cell-index = <4>;		cell-index = <4>;
	reg = <640 10>;		reg = <640 10>;
	interrupts = <1 d 0>;		interrupts = <1 d 0>;
	@@ -116,8 +111,7 @@
	};		};

	gpt@650 { // General Purpose Timer		gpt@650 { // General Purpose Timer
	compatible = "mpc5200b-gpt","mpc5200-gpt";		compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
	device_type = "gpt";
	cell-index = <5>;		cell-index = <5>;
	reg = <650 10>;		reg = <650 10>;
	interrupts = <1 e 0>;		interrupts = <1 e 0>;
	@@ -125,8 +119,7 @@
	};		};

	gpt@660 { // General Purpose Timer		gpt@660 { // General Purpose Timer
	compatible = "mpc5200b-gpt","mpc5200-gpt";		compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
	device_type = "gpt";
	cell-index = <6>;		cell-index = <6>;
	reg = <660 10>;		reg = <660 10>;
	interrupts = <1 f 0>;		interrupts = <1 f 0>;
	@@ -134,8 +127,7 @@
	};		};

	gpt@670 { // General Purpose Timer		gpt@670 { // General Purpose Timer
	compatible = "mpc5200b-gpt","mpc5200-gpt";		compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
	device_type = "gpt";
	cell-index = <7>;		cell-index = <7>;
	reg = <670 10>;		reg = <670 10>;
	interrupts = <1 10 0>;		interrupts = <1 10 0>;

arch/powerpc/platforms/52xx/lite5200.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -145,6 +145,9 @@ static void __init lite5200_setup_arch(void)
	/* Some mpc5200 & mpc5200b related configuration */		/* Some mpc5200 & mpc5200b related configuration */
	mpc5200_setup_xlb_arbiter();		mpc5200_setup_xlb_arbiter();

			/* Map wdt for mpc52xx_restart() */
			mpc52xx_map_wdt();

	#ifdef CONFIG_PM		#ifdef CONFIG_PM
	mpc52xx_suspend.board_suspend_prepare = lite5200_suspend_prepare;		mpc52xx_suspend.board_suspend_prepare = lite5200_suspend_prepare;
	mpc52xx_suspend.board_resume_finish = lite5200_resume_finish;		mpc52xx_suspend.board_resume_finish = lite5200_resume_finish;
	@@ -183,5 +186,6 @@ define_machine(lite5200) {
	.init = mpc52xx_declare_of_platform_devices,		.init = mpc52xx_declare_of_platform_devices,
	.init_IRQ = mpc52xx_init_irq,		.init_IRQ = mpc52xx_init_irq,
	.get_irq = mpc52xx_get_irq,		.get_irq = mpc52xx_get_irq,
			.restart = mpc52xx_restart,
	.calibrate_decr = generic_calibrate_decr,		.calibrate_decr = generic_calibrate_decr,
	};		};

arch/powerpc/platforms/52xx/mpc52xx_common.c

+67 −4

Original line number	Original line	Diff line number	Diff line
	@@ -18,15 +18,20 @@
	#include <asm/prom.h>		#include <asm/prom.h>
	#include <asm/mpc52xx.h>		#include <asm/mpc52xx.h>

			/*
			* This variable is mapped in mpc52xx_map_wdt() and used in mpc52xx_restart().
			* Permanent mapping is required because mpc52xx_restart() can be called
			* from interrupt context while node mapping (which calls ioremap())
			* cannot be used at such point.
			*/
			static volatile struct mpc52xx_gpt *mpc52xx_wdt = NULL;

	void __iomem *		static void __iomem *
	mpc52xx_find_and_map(const char *compatible)		mpc52xx_map_node(struct device_node *ofn)
	{		{
	struct device_node *ofn;
	const u32 *regaddr_p;		const u32 *regaddr_p;
	u64 regaddr64, size64;		u64 regaddr64, size64;

	ofn = of_find_compatible_node(NULL, NULL, compatible);
	if (!ofn)		if (!ofn)
	return NULL;		return NULL;

	@@ -42,8 +47,23 @@ mpc52xx_find_and_map(const char *compatible)

	return ioremap((u32)regaddr64, (u32)size64);		return ioremap((u32)regaddr64, (u32)size64);
	}		}

			void __iomem *
			mpc52xx_find_and_map(const char *compatible)
			{
			return mpc52xx_map_node(
			of_find_compatible_node(NULL, NULL, compatible));
			}

	EXPORT_SYMBOL(mpc52xx_find_and_map);		EXPORT_SYMBOL(mpc52xx_find_and_map);

			void __iomem *
			mpc52xx_find_and_map_path(const char *path)
			{
			return mpc52xx_map_node(of_find_node_by_path(path));
			}

			EXPORT_SYMBOL(mpc52xx_find_and_map_path);

	/**		/**
	* mpc52xx_find_ipb_freq - Find the IPB bus frequency for a device		* mpc52xx_find_ipb_freq - Find the IPB bus frequency for a device
	@@ -113,3 +133,46 @@ mpc52xx_declare_of_platform_devices(void)
	"Error while probing of_platform bus\n");		"Error while probing of_platform bus\n");
	}		}

			void __init
			mpc52xx_map_wdt(void)
			{
			const void *has_wdt;
			struct device_node *np;

			/* mpc52xx_wdt is mapped here and used in mpc52xx_restart,
			* possibly from a interrupt context. wdt is only implement
			* on a gpt0, so check has-wdt property before mapping.
			*/
			for_each_compatible_node(np, NULL, "fsl,mpc5200-gpt") {
			has_wdt = of_get_property(np, "fsl,has-wdt", NULL);
			if (has_wdt) {
			mpc52xx_wdt = mpc52xx_map_node(np);
			return;
			}
			}
			for_each_compatible_node(np, NULL, "mpc5200-gpt") {
			has_wdt = of_get_property(np, "has-wdt", NULL);
			if (has_wdt) {
			mpc52xx_wdt = mpc52xx_map_node(np);
			return;
			}
			}
			}

			void
			mpc52xx_restart(char *cmd)
			{
			local_irq_disable();

			/* Turn on the watchdog and wait for it to expire.
			* It effectively does a reset. */
			if (mpc52xx_wdt) {
			out_be32(&mpc52xx_wdt->mode, 0x00000000);
			out_be32(&mpc52xx_wdt->count, 0x000000ff);
			out_be32(&mpc52xx_wdt->mode, 0x00009004);
			} else
			printk("mpc52xx_restart: Can't access wdt. "
			"Restart impossible, system halted.\n");

			while (1);
			}

Original line number	Original line	Diff line number	Diff line
	@@ -185,7 +185,7 @@ bestcomm@<addr> dma-controller mpc5200-bestcomm 5200 pic also requires
	Recommended soc5200 child nodes; populate as needed for your board		Recommended soc5200 child nodes; populate as needed for your board
	name device_type compatible Description		name device_type compatible Description
	---- ----------- ---------- -----------		---- ----------- ---------- -----------
	gpt@<addr> gpt mpc5200-gpt General purpose timers		gpt@<addr> gpt fsl,mpc5200-gpt General purpose timers
	rtc@<addr> rtc mpc5200-rtc Real time clock		rtc@<addr> rtc mpc5200-rtc Real time clock
	mscan@<addr> mscan mpc5200-mscan CAN bus controller		mscan@<addr> mscan mpc5200-mscan CAN bus controller
	pci@<addr> pci mpc5200-pci PCI bridge		pci@<addr> pci mpc5200-pci PCI bridge
	@@ -213,7 +213,7 @@ cell-index int When multiple devices are present, is the
	5) General Purpose Timer nodes (child of soc5200 node)		5) General Purpose Timer nodes (child of soc5200 node)
	On the mpc5200 and 5200b, GPT0 has a watchdog timer function. If the board		On the mpc5200 and 5200b, GPT0 has a watchdog timer function. If the board
	design supports the internal wdt, then the device node for GPT0 should		design supports the internal wdt, then the device node for GPT0 should
	include the empty property 'has-wdt'.		include the empty property 'fsl,has-wdt'.

	6) PSC nodes (child of soc5200 node)		6) PSC nodes (child of soc5200 node)
	PSC nodes can define the optional 'port-number' property to force assignment		PSC nodes can define the optional 'port-number' property to force assignment