Merge commit 'gcl/merge' into next (b71a107c) · Commits · e / devices / android_kernel_xiaomi_markw

arch/powerpc/boot/dts/pcm030.dts

+4 −22

Original line number	Diff line number	Diff line
		@@ -258,34 +258,16 @@
		compatible = "nxp,pcf8563";
		reg = <0x51>;
		};
		/* FIXME: EEPROM */
		eeprom@52 {
		compatible = "catalyst,24c32";
		reg = <0x52>;
		};
		};

		sram@8000 {
		compatible = "fsl,mpc5200b-sram","fsl,mpc5200-sram";
		reg = <0x8000 0x4000>;
		};

		/* This is only an example device to show the usage of gpios. It maps all available
		* gpios to the "gpio-provider" device.
		*/
		gpio {
		compatible = "gpio-provider";

		/* mpc52xx exp.con patchfield */
		gpios = <&gpio_wkup 0 0 /* GPIO_WKUP_7 11d jp13-3 */
		&gpio_wkup 1 0 /* GPIO_WKUP_6 14c */
		&gpio_wkup 6 0 /* PSC2_4 43c x5-11 */
		&gpio_simple 2 0 /* IRDA_1 24c x7-6 set GPS_PORT_CONFIG[IRDA] = 0 */
		&gpio_simple 3 0 /* IRDA_0 x8-5 set GPS_PORT_CONFIG[IRDA] = 0 */
		&gpt2 0 0 /* timer2 12d x4-4 */
		&gpt3 0 0 /* timer3 13d x6-4 */
		&gpt4 0 0 /* timer4 61c x2-16 */
		&gpt5 0 0 /* timer5 44c x7-11 */
		&gpt6 0 0 /* timer6 60c x8-15 */
		&gpt7 0 0 /* timer7 36a x17-9 */
		>;
		};
		};

		pci@f0000d00 {

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		#ifndef __ASSEMBLY__
		#include <asm/types.h>
		#include <asm/prom.h>
		#include <asm/mpc5xxx.h>
		#endif /* __ASSEMBLY__ */

		#include <linux/suspend.h>
		@@ -268,7 +269,6 @@ struct mpc52xx_intr {
		#ifndef __ASSEMBLY__

		/* mpc52xx_common.c */
		extern unsigned int mpc52xx_find_ipb_freq(struct device_node *node);
		extern void mpc5200_setup_xlb_arbiter(void);
		extern void mpc52xx_declare_of_platform_devices(void);
		extern void mpc52xx_map_common_devices(void);

+5 −5

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		* Author: John Rigby, <jrigby@freescale.com>, Friday Apr 13 2007
		*
		* Description:
		* MPC5121 Prototypes and definitions
		* MPC5xxx Prototypes and definitions
		*
		* This is free software; you can redistribute it and/or modify it
		* under the terms of the GNU General Public License as published by
		@@ -13,10 +13,10 @@
		*
		*/

		#ifndef __ASM_POWERPC_MPC512x_H__
		#define __ASM_POWERPC_MPC512x_H__
		#ifndef __ASM_POWERPC_MPC5xxx_H__
		#define __ASM_POWERPC_MPC5xxx_H__

		extern unsigned long mpc512x_find_ips_freq(struct device_node *node);
		extern unsigned long mpc5xxx_get_bus_frequency(struct device_node *node);

		#endif /* __ASM_POWERPC_MPC512x_H__ */
		#endif /* __ASM_POWERPC_MPC5xxx_H__ */

+5 −5

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@
		#include <linux/io.h>

		#include <linux/of_platform.h>
		#include <asm/mpc512x.h>
		#include <asm/mpc5xxx.h>
		#include <asm/clk_interface.h>

		#undef CLK_DEBUG
		@@ -83,13 +83,13 @@ static void dump_clocks(void)
		mutex_lock(&clocks_mutex);
		printk(KERN_INFO "CLOCKS:\n");
		list_for_each_entry(p, &clocks, node) {
		printk(KERN_INFO " %s %ld", p->name, p->rate);
		pr_info(" %s=%ld", p->name, p->rate);
		if (p->parent)
		printk(KERN_INFO " %s %ld", p->parent->name,
		pr_cont(" %s=%ld", p->parent->name,
		p->parent->rate);
		if (p->flags & CLK_HAS_CTRL)
		printk(KERN_INFO " reg/bit %d/%d", p->reg, p->bit);
		printk("\n");
		pr_cont(" reg/bit=%d/%d", p->reg, p->bit);
		pr_cont("\n");
		}
		mutex_unlock(&clocks_mutex);
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,6 @@

		#ifndef __MPC512X_H__
		#define __MPC512X_H__
		extern unsigned long mpc512x_find_ips_freq(struct device_node *node);
		extern void __init mpc512x_init_IRQ(void);
		void __init mpc512x_declare_of_platform_devices(void);
		#endif /* __MPC512X_H__ */