ARM: OMAP2+: PRCM: consolidate PRCM-related timeout macros (b13159af) · Commits · 戴 / test

arch/arm/mach-omap2/display.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@
		#include "mux.h"
		#include "control.h"
		#include "display.h"
		#include "prm.h"

		#define DISPC_CONTROL 0x0040
		#define DISPC_CONTROL2 0x0238
		@@ -512,7 +513,6 @@ static void dispc_disable_outputs(void)
		}
		}

		#define MAX_MODULE_SOFTRESET_WAIT 10000
		int omap_dss_reset(struct omap_hwmod *oh)
		{
		struct omap_hwmod_opt_clk *oc;

+1 −3

Original line number	Diff line number	Diff line
		@@ -31,11 +31,9 @@
		#include "omap_device.h"
		#include "hdq1w.h"

		#include "prm.h"
		#include "common.h"

		/* Maximum microseconds to wait for OMAP module to softreset */
		#define MAX_MODULE_SOFTRESET_WAIT 10000

		/**
		* omap_hdq1w_reset - reset the OMAP HDQ1W module
		* @oh: struct omap_hwmod *

+2 −4

Original line number	Diff line number	Diff line
		@@ -20,10 +20,11 @@
		*/

		#include "soc.h"
		#include "common.h"
		#include "omap_hwmod.h"
		#include "omap_device.h"

		#include "prm.h"
		#include "common.h"
		#include "mux.h"
		#include "i2c.h"

		@@ -32,9 +33,6 @@
		#define OMAP2_I2C_CON_OFFSET 0x24
		#define OMAP4_I2C_CON_OFFSET 0xA4

		/* Maximum microseconds to wait for OMAP module to softreset */
		#define MAX_MODULE_SOFTRESET_WAIT 10000

		#define MAX_OMAP_I2C_HWMOD_NAME_LEN 16

		static void __init omap2_i2c_mux_pins(int bus_id)

+1 −3

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@
		#include <linux/err.h>
		#include <linux/platform_data/gpio-omap.h>

		#include "prm.h"
		#include "common.h"
		#include "control.h"
		#include "omap_hwmod.h"
		@@ -43,9 +44,6 @@
		#define MSDI_CON_CLKD_MASK (0x3f << 0)
		#define MSDI_CON_CLKD_SHIFT 0

		/* Maximum microseconds to wait for OMAP module to softreset */
		#define MAX_MODULE_SOFTRESET_WAIT 10000

		/* MSDI_TARGET_RESET_CLKD: clock divisor to use throughout the reset */
		#define MSDI_TARGET_RESET_CLKD 0x3ff

+1 −3

Original line number	Diff line number	Diff line
		@@ -151,6 +151,7 @@
		#include "cm3xxx.h"
		#include "cminst44xx.h"
		#include "cm33xx.h"
		#include "prm.h"
		#include "prm3xxx.h"
		#include "prm44xx.h"
		#include "prm33xx.h"
		@@ -158,9 +159,6 @@
		#include "mux.h"
		#include "pm.h"

		/* Maximum microseconds to wait for OMAP module to softreset */
		#define MAX_MODULE_SOFTRESET_WAIT 10000

		/* Name of the OMAP hwmod for the MPU */
		#define MPU_INITIATOR_NAME "mpu"