Merge tag 'renesas-boards2-for-v3.11' of... (969ae2ac) · Commits · 戴 / test

arch/arm/mach-shmobile/board-bockw.c

+97 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,11 +20,14 @@

	#include <linux/mfd/tmio.h>		#include <linux/mfd/tmio.h>
	#include <linux/mmc/host.h>		#include <linux/mmc/host.h>
			#include <linux/mtd/partitions.h>
	#include <linux/pinctrl/machine.h>		#include <linux/pinctrl/machine.h>
	#include <linux/platform_device.h>		#include <linux/platform_device.h>
	#include <linux/regulator/fixed.h>		#include <linux/regulator/fixed.h>
	#include <linux/regulator/machine.h>		#include <linux/regulator/machine.h>
	#include <linux/smsc911x.h>		#include <linux/smsc911x.h>
			#include <linux/spi/spi.h>
			#include <linux/spi/flash.h>
	#include <mach/common.h>		#include <mach/common.h>
	#include <mach/irqs.h>		#include <mach/irqs.h>
	#include <mach/r8a7778.h>		#include <mach/r8a7778.h>
	@@ -38,6 +41,23 @@
	* SW41 SCIF RCAN		* SW41 SCIF RCAN
	*/		*/

			/*
			* MMC (CN26) pin
			*
			* SW6 (D2) 3 pin
			* SW7 (D5) ON
			* SW8 (D3) 3 pin
			* SW10 (D4) 1 pin
			* SW12 (CLK) 1 pin
			* SW13 (D6) 3 pin
			* SW14 (CMD) ON
			* SW15 (D6) 1 pin
			* SW16 (D0) ON
			* SW17 (D1) ON
			* SW18 (D7) 3 pin
			* SW19 (MMC) 1 pin
			*/

	/* Dummy supplies, where voltage doesn't matter */		/* Dummy supplies, where voltage doesn't matter */
	static struct regulator_consumer_supply dummy_supplies[] = {		static struct regulator_consumer_supply dummy_supplies[] = {
	REGULATOR_SUPPLY("vddvario", "smsc911x"),		REGULATOR_SUPPLY("vddvario", "smsc911x"),
	@@ -63,7 +83,75 @@ static struct sh_mobile_sdhi_info sdhi0_info = {
	.tmio_flags = TMIO_MMC_HAS_IDLE_WAIT,		.tmio_flags = TMIO_MMC_HAS_IDLE_WAIT,
	};		};

			static struct sh_eth_plat_data ether_platform_data __initdata = {
			.phy = 0x01,
			.edmac_endian = EDMAC_LITTLE_ENDIAN,
			.register_type = SH_ETH_REG_FAST_RCAR,
			.phy_interface = PHY_INTERFACE_MODE_RMII,
			/*
			* Although the LINK signal is available on the board, it's connected to
			* the link/activity LED output of the PHY, thus the link disappears and
			* reappears after each packet. We'd be better off ignoring such signal
			* and getting the link state from the PHY indirectly.
			*/
			.no_ether_link = 1,
			};

			/* I2C */
			static struct i2c_board_info i2c0_devices[] = {
			{
			I2C_BOARD_INFO("rx8581", 0x51),
			},
			};

			/* HSPI*/
			static struct mtd_partition m25p80_spi_flash_partitions[] = {
			{
			.name = "data(spi)",
			.size = 0x0100000,
			.offset = 0,
			},
			};

			static struct flash_platform_data spi_flash_data = {
			.name = "m25p80",
			.type = "s25fl008k",
			.parts = m25p80_spi_flash_partitions,
			.nr_parts = ARRAY_SIZE(m25p80_spi_flash_partitions),
			};

			static struct spi_board_info spi_board_info[] __initdata = {
			{
			.modalias = "m25p80",
			.max_speed_hz = 104000000,
			.chip_select = 0,
			.bus_num = 0,
			.mode = SPI_MODE_0,
			.platform_data = &spi_flash_data,
			},
			};

			/* MMC */
			static struct sh_mmcif_plat_data sh_mmcif_plat = {
			.sup_pclk = 0,
			.ocr = MMC_VDD_165_195 \| MMC_VDD_32_33 \| MMC_VDD_33_34,
			.caps = MMC_CAP_4_BIT_DATA \|
			MMC_CAP_8_BIT_DATA \|
			MMC_CAP_NEEDS_POLL,
			};

	static const struct pinctrl_map bockw_pinctrl_map[] = {		static const struct pinctrl_map bockw_pinctrl_map[] = {
			/* Ether */
			PIN_MAP_MUX_GROUP_DEFAULT("r8a777x-ether", "pfc-r8a7778",
			"ether_rmii", "ether"),
			/* HSPI0 */
			PIN_MAP_MUX_GROUP_DEFAULT("sh-hspi.0", "pfc-r8a7778",
			"hspi0_a", "hspi0"),
			/* MMC */
			PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif", "pfc-r8a7778",
			"mmc_data8", "mmc"),
			PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif", "pfc-r8a7778",
			"mmc_ctrl", "mmc"),
	/* SCIF0 */		/* SCIF0 */
	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a7778",		PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a7778",
	"scif0_data_a", "scif0"),		"scif0_data_a", "scif0"),
	@@ -85,7 +173,15 @@ static void __init bockw_init(void)
	r8a7778_clock_init();		r8a7778_clock_init();
	r8a7778_init_irq_extpin(1);		r8a7778_init_irq_extpin(1);
	r8a7778_add_standard_devices();		r8a7778_add_standard_devices();
			r8a7778_add_ether_device(&ether_platform_data);
			r8a7778_add_i2c_device(0);
			r8a7778_add_hspi_device(0);
			r8a7778_add_mmc_device(&sh_mmcif_plat);

			i2c_register_board_info(0, i2c0_devices,
			ARRAY_SIZE(i2c0_devices));
			spi_register_board_info(spi_board_info,
			ARRAY_SIZE(spi_board_info));
	pinctrl_register_mappings(bockw_pinctrl_map,		pinctrl_register_mappings(bockw_pinctrl_map,
	ARRAY_SIZE(bockw_pinctrl_map));		ARRAY_SIZE(bockw_pinctrl_map));
	r8a7778_pinmux_init();		r8a7778_pinmux_init();

arch/arm/mach-shmobile/clock-r8a73a4.c

+17 −5

Original line number	Original line	Diff line number	Diff line
	@@ -29,6 +29,7 @@
	#define CPG_LEN 0x270		#define CPG_LEN 0x270

	#define SMSTPCR2 0xe6150138		#define SMSTPCR2 0xe6150138
			#define SMSTPCR3 0xe615013c
	#define SMSTPCR5 0xe6150144		#define SMSTPCR5 0xe6150144

	#define FRQCRA 0xE6150000		#define FRQCRA 0xE6150000
	@@ -348,6 +349,7 @@ static struct clk div6_clks[DIV6_NR] = {
	/* MSTP */		/* MSTP */
	enum {		enum {
	MSTP217, MSTP216, MSTP207, MSTP206, MSTP204, MSTP203,		MSTP217, MSTP216, MSTP207, MSTP206, MSTP204, MSTP203,
			MSTP315, MSTP314, MSTP313, MSTP312, MSTP305,
	MSTP522,		MSTP522,
	MSTP_NR		MSTP_NR
	};		};
	@@ -359,6 +361,11 @@ static struct clk mstp_clks[MSTP_NR] = {
	[MSTP207] = SH_CLK_MSTP32(&div6_clks[DIV6_MP], SMSTPCR2, 7, 0), /* SCIFB1 */		[MSTP207] = SH_CLK_MSTP32(&div6_clks[DIV6_MP], SMSTPCR2, 7, 0), /* SCIFB1 */
	[MSTP216] = SH_CLK_MSTP32(&div6_clks[DIV6_MP], SMSTPCR2, 16, 0), /* SCIFB2 */		[MSTP216] = SH_CLK_MSTP32(&div6_clks[DIV6_MP], SMSTPCR2, 16, 0), /* SCIFB2 */
	[MSTP217] = SH_CLK_MSTP32(&div6_clks[DIV6_MP], SMSTPCR2, 17, 0), /* SCIFB3 */		[MSTP217] = SH_CLK_MSTP32(&div6_clks[DIV6_MP], SMSTPCR2, 17, 0), /* SCIFB3 */
			[MSTP305] = SH_CLK_MSTP32(&div6_clks[DIV6_MMC1],SMSTPCR3, 5, 0), /* MMCIF1 */
			[MSTP312] = SH_CLK_MSTP32(&div6_clks[DIV6_SDHI2],SMSTPCR3, 12, 0), /* SDHI2 */
			[MSTP313] = SH_CLK_MSTP32(&div6_clks[DIV6_SDHI1],SMSTPCR3, 13, 0), /* SDHI1 */
			[MSTP314] = SH_CLK_MSTP32(&div6_clks[DIV6_SDHI0],SMSTPCR3, 14, 0), /* SDHI0 */
			[MSTP315] = SH_CLK_MSTP32(&div6_clks[DIV6_MMC0],SMSTPCR3, 15, 0), /* MMCIF0 */
	[MSTP522] = SH_CLK_MSTP32(&extal2_clk, SMSTPCR5, 22, 0), /* Thermal */		[MSTP522] = SH_CLK_MSTP32(&extal2_clk, SMSTPCR5, 22, 0), /* Thermal */
	};		};

	@@ -381,11 +388,6 @@ static struct clk_lookup lookups[] = {

	/* DIV6 */		/* DIV6 */
	CLKDEV_CON_ID("zb", &div6_clks[DIV6_ZB]),		CLKDEV_CON_ID("zb", &div6_clks[DIV6_ZB]),
	CLKDEV_CON_ID("sdhi0", &div6_clks[DIV6_SDHI0]),
	CLKDEV_CON_ID("sdhi1", &div6_clks[DIV6_SDHI1]),
	CLKDEV_CON_ID("sdhi2", &div6_clks[DIV6_SDHI2]),
	CLKDEV_CON_ID("mmc0", &div6_clks[DIV6_MMC0]),
	CLKDEV_CON_ID("mmc1", &div6_clks[DIV6_MMC1]),
	CLKDEV_CON_ID("vck1", &div6_clks[DIV6_VCK1]),		CLKDEV_CON_ID("vck1", &div6_clks[DIV6_VCK1]),
	CLKDEV_CON_ID("vck2", &div6_clks[DIV6_VCK2]),		CLKDEV_CON_ID("vck2", &div6_clks[DIV6_VCK2]),
	CLKDEV_CON_ID("vck3", &div6_clks[DIV6_VCK3]),		CLKDEV_CON_ID("vck3", &div6_clks[DIV6_VCK3]),
	@@ -406,6 +408,16 @@ static struct clk_lookup lookups[] = {
	CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP216]),		CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP216]),
	CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP217]),		CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP217]),
	CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),		CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),
			CLKDEV_DEV_ID("sh_mmcif.1", &mstp_clks[MSTP305]),
			CLKDEV_DEV_ID("ee220000.mmcif", &mstp_clks[MSTP305]),
			CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP312]),
			CLKDEV_DEV_ID("ee140000.sdhi", &mstp_clks[MSTP312]),
			CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP313]),
			CLKDEV_DEV_ID("ee120000.sdhi", &mstp_clks[MSTP313]),
			CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]),
			CLKDEV_DEV_ID("ee100000.sdhi", &mstp_clks[MSTP314]),
			CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP315]),
			CLKDEV_DEV_ID("ee200000.mmcif", &mstp_clks[MSTP315]),

	/* for DT */		/* for DT */
	CLKDEV_DEV_ID("e61f0000.thermal", &mstp_clks[MSTP522]),		CLKDEV_DEV_ID("e61f0000.thermal", &mstp_clks[MSTP522]),

arch/arm/mach-shmobile/clock-r8a7778.c

+22 −1

Original line number	Original line	Diff line number	Diff line
	@@ -103,17 +103,25 @@ static struct clk *main_clks[] = {
	};		};

	enum {		enum {
			MSTP331,
	MSTP323, MSTP322, MSTP321,		MSTP323, MSTP322, MSTP321,
	MSTP114,		MSTP114,
	MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021,		MSTP030,
			MSTP029, MSTP028, MSTP027, MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021,
	MSTP016, MSTP015,		MSTP016, MSTP015,
			MSTP007,
	MSTP_NR };		MSTP_NR };

	static struct clk mstp_clks[MSTP_NR] = {		static struct clk mstp_clks[MSTP_NR] = {
			[MSTP331] = SH_CLK_MSTP32(&s4_clk, MSTPCR3, 31, 0), /* MMC */
	[MSTP323] = SH_CLK_MSTP32(&p_clk, MSTPCR3, 23, 0), /* SDHI0 */		[MSTP323] = SH_CLK_MSTP32(&p_clk, MSTPCR3, 23, 0), /* SDHI0 */
	[MSTP322] = SH_CLK_MSTP32(&p_clk, MSTPCR3, 22, 0), /* SDHI1 */		[MSTP322] = SH_CLK_MSTP32(&p_clk, MSTPCR3, 22, 0), /* SDHI1 */
	[MSTP321] = SH_CLK_MSTP32(&p_clk, MSTPCR3, 21, 0), /* SDHI2 */		[MSTP321] = SH_CLK_MSTP32(&p_clk, MSTPCR3, 21, 0), /* SDHI2 */
	[MSTP114] = SH_CLK_MSTP32(&p_clk, MSTPCR1, 14, 0), /* Ether */		[MSTP114] = SH_CLK_MSTP32(&p_clk, MSTPCR1, 14, 0), /* Ether */
			[MSTP030] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 30, 0), /* I2C0 */
			[MSTP029] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 29, 0), /* I2C1 */
			[MSTP028] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 28, 0), /* I2C2 */
			[MSTP027] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 27, 0), /* I2C3 */
	[MSTP026] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 26, 0), /* SCIF0 */		[MSTP026] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 26, 0), /* SCIF0 */
	[MSTP025] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 25, 0), /* SCIF1 */		[MSTP025] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 25, 0), /* SCIF1 */
	[MSTP024] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 24, 0), /* SCIF2 */		[MSTP024] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 24, 0), /* SCIF2 */
	@@ -122,14 +130,24 @@ static struct clk mstp_clks[MSTP_NR] = {
	[MSTP021] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 21, 0), /* SCIF5 */		[MSTP021] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 21, 0), /* SCIF5 */
	[MSTP016] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 16, 0), /* TMU0 */		[MSTP016] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 16, 0), /* TMU0 */
	[MSTP015] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 15, 0), /* TMU1 */		[MSTP015] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 15, 0), /* TMU1 */
			[MSTP007] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 7, 0), /* HSPI */
	};		};

	static struct clk_lookup lookups[] = {		static struct clk_lookup lookups[] = {
			/* main */
			CLKDEV_CON_ID("shyway_clk", &s_clk),
			CLKDEV_CON_ID("peripheral_clk", &p_clk),

	/* MSTP32 clocks */		/* MSTP32 clocks */
			CLKDEV_DEV_ID("sh_mmcif", &mstp_clks[MSTP331]), /* MMC */
	CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP323]), /* SDHI0 */		CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP323]), /* SDHI0 */
	CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP322]), /* SDHI1 */		CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP322]), /* SDHI1 */
	CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP321]), /* SDHI2 */		CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP321]), /* SDHI2 */
	CLKDEV_DEV_ID("sh-eth", &mstp_clks[MSTP114]), /* Ether */		CLKDEV_DEV_ID("sh-eth", &mstp_clks[MSTP114]), /* Ether */
			CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP030]), /* I2C0 */
			CLKDEV_DEV_ID("i2c-rcar.1", &mstp_clks[MSTP029]), /* I2C1 */
			CLKDEV_DEV_ID("i2c-rcar.2", &mstp_clks[MSTP028]), /* I2C2 */
			CLKDEV_DEV_ID("i2c-rcar.3", &mstp_clks[MSTP027]), /* I2C3 */
	CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP026]), /* SCIF0 */		CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP026]), /* SCIF0 */
	CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP025]), /* SCIF1 */		CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP025]), /* SCIF1 */
	CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP024]), /* SCIF2 */		CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP024]), /* SCIF2 */
	@@ -138,6 +156,9 @@ static struct clk_lookup lookups[] = {
	CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP021]), /* SCIF6 */		CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP021]), /* SCIF6 */
	CLKDEV_DEV_ID("sh_tmu.0", &mstp_clks[MSTP016]), /* TMU00 */		CLKDEV_DEV_ID("sh_tmu.0", &mstp_clks[MSTP016]), /* TMU00 */
	CLKDEV_DEV_ID("sh_tmu.1", &mstp_clks[MSTP015]), /* TMU01 */		CLKDEV_DEV_ID("sh_tmu.1", &mstp_clks[MSTP015]), /* TMU01 */
			CLKDEV_DEV_ID("sh-hspi.0", &mstp_clks[MSTP007]), /* HSPI0 */
			CLKDEV_DEV_ID("sh-hspi.1", &mstp_clks[MSTP007]), /* HSPI1 */
			CLKDEV_DEV_ID("sh-hspi.2", &mstp_clks[MSTP007]), /* HSPI2 */
	};		};

	void __init r8a7778_clock_init(void)		void __init r8a7778_clock_init(void)

arch/arm/mach-shmobile/clock-r8a7790.c

+24 −7

Original line number	Original line	Diff line number	Diff line
	@@ -181,7 +181,8 @@ static struct clk div6_clks[DIV6_NR] = {
	/* MSTP */		/* MSTP */
	enum {		enum {
	MSTP721, MSTP720,		MSTP721, MSTP720,
	MSTP304,		MSTP717, MSTP716,
			MSTP315, MSTP314, MSTP313, MSTP312, MSTP311, MSTP305, MSTP304,
	MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202,		MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202,
	MSTP_NR		MSTP_NR
	};		};
	@@ -189,6 +190,12 @@ enum {
	static struct clk mstp_clks[MSTP_NR] = {		static struct clk mstp_clks[MSTP_NR] = {
	[MSTP721] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 21, 0), /* SCIF0 */		[MSTP721] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 21, 0), /* SCIF0 */
	[MSTP720] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 20, 0), /* SCIF1 */		[MSTP720] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 20, 0), /* SCIF1 */
			[MSTP315] = SH_CLK_MSTP32(&div6_clks[DIV6_MMC0], SMSTPCR3, 15, 0), /* MMC0 */
			[MSTP314] = SH_CLK_MSTP32(&div4_clks[DIV4_SD0], SMSTPCR3, 14, 0), /* SDHI0 */
			[MSTP313] = SH_CLK_MSTP32(&div4_clks[DIV4_SD1], SMSTPCR3, 13, 0), /* SDHI1 */
			[MSTP312] = SH_CLK_MSTP32(&div6_clks[DIV6_SD2], SMSTPCR3, 12, 0), /* SDHI2 */
			[MSTP311] = SH_CLK_MSTP32(&div6_clks[DIV6_SD3], SMSTPCR3, 11, 0), /* SDHI3 */
			[MSTP305] = SH_CLK_MSTP32(&div6_clks[DIV6_MMC1], SMSTPCR3, 5, 0), /* MMC1 */
	[MSTP304] = SH_CLK_MSTP32(&cp_clk, SMSTPCR3, 4, 0), /* TPU0 */		[MSTP304] = SH_CLK_MSTP32(&cp_clk, SMSTPCR3, 4, 0), /* TPU0 */
	[MSTP216] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 16, 0), /* SCIFB2 */		[MSTP216] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 16, 0), /* SCIFB2 */
	[MSTP207] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 7, 0), /* SCIFB1 */		[MSTP207] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 7, 0), /* SCIFB1 */
	@@ -196,6 +203,8 @@ static struct clk mstp_clks[MSTP_NR] = {
	[MSTP204] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 4, 0), /* SCIFA0 */		[MSTP204] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 4, 0), /* SCIFA0 */
	[MSTP203] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 3, 0), /* SCIFA1 */		[MSTP203] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 3, 0), /* SCIFA1 */
	[MSTP202] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 2, 0), /* SCIFA2 */		[MSTP202] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 2, 0), /* SCIFA2 */
			[MSTP717] = SH_CLK_MSTP32(&zs_clk, SMSTPCR7, 17, 0), /* HSCIF0 */
			[MSTP716] = SH_CLK_MSTP32(&zs_clk, SMSTPCR7, 16, 0), /* HSCIF1 */
	};		};

	static struct clk_lookup lookups[] = {		static struct clk_lookup lookups[] = {
	@@ -229,14 +238,8 @@ static struct clk_lookup lookups[] = {

	/* DIV4 */		/* DIV4 */
	CLKDEV_CON_ID("sdh", &div4_clks[DIV4_SDH]),		CLKDEV_CON_ID("sdh", &div4_clks[DIV4_SDH]),
	CLKDEV_CON_ID("sd0", &div4_clks[DIV4_SD0]),
	CLKDEV_CON_ID("sd1", &div4_clks[DIV4_SD1]),

	/* DIV6 */		/* DIV6 */
	CLKDEV_CON_ID("sd2", &div6_clks[DIV6_SD2]),
	CLKDEV_CON_ID("sd3", &div6_clks[DIV6_SD3]),
	CLKDEV_CON_ID("mmc0", &div6_clks[DIV6_MMC0]),
	CLKDEV_CON_ID("mmc1", &div6_clks[DIV6_MMC1]),
	CLKDEV_CON_ID("ssp", &div6_clks[DIV6_SSP]),		CLKDEV_CON_ID("ssp", &div6_clks[DIV6_SSP]),
	CLKDEV_CON_ID("ssprs", &div6_clks[DIV6_SSPRS]),		CLKDEV_CON_ID("ssprs", &div6_clks[DIV6_SSPRS]),

	@@ -249,6 +252,20 @@ static struct clk_lookup lookups[] = {
	CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP202]),		CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP202]),
	CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP721]),		CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP721]),
	CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP720]),		CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP720]),
			CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP717]),
			CLKDEV_DEV_ID("sh-sci.9", &mstp_clks[MSTP716]),
			CLKDEV_DEV_ID("ee200000.mmcif", &mstp_clks[MSTP315]),
			CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP315]),
			CLKDEV_DEV_ID("ee100000.sdhi", &mstp_clks[MSTP314]),
			CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]),
			CLKDEV_DEV_ID("ee120000.sdhi", &mstp_clks[MSTP313]),
			CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP313]),
			CLKDEV_DEV_ID("ee140000.sdhi", &mstp_clks[MSTP312]),
			CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP312]),
			CLKDEV_DEV_ID("ee160000.sdhi", &mstp_clks[MSTP311]),
			CLKDEV_DEV_ID("sh_mobile_sdhi.3", &mstp_clks[MSTP311]),
			CLKDEV_DEV_ID("ee220000.mmcif", &mstp_clks[MSTP305]),
			CLKDEV_DEV_ID("sh_mmcif.1", &mstp_clks[MSTP305]),
	};		};

	#define R8A7790_CLOCK_ROOT(e, m, p0, p1, p30, p31) \		#define R8A7790_CLOCK_ROOT(e, m, p0, p1, p30, p31) \

arch/arm/mach-shmobile/include/mach/r8a7778.h

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,12 +18,17 @@
	#ifndef __ASM_R8A7778_H__		#ifndef __ASM_R8A7778_H__
	#define __ASM_R8A7778_H__		#define __ASM_R8A7778_H__

			#include <linux/mmc/sh_mmcif.h>
	#include <linux/mmc/sh_mobile_sdhi.h>		#include <linux/mmc/sh_mobile_sdhi.h>
	#include <linux/sh_eth.h>		#include <linux/sh_eth.h>

	extern void r8a7778_add_standard_devices(void);		extern void r8a7778_add_standard_devices(void);
	extern void r8a7778_add_standard_devices_dt(void);		extern void r8a7778_add_standard_devices_dt(void);
	extern void r8a7778_add_ether_device(struct sh_eth_plat_data *pdata);		extern void r8a7778_add_ether_device(struct sh_eth_plat_data *pdata);
			extern void r8a7778_add_i2c_device(int id);
			extern void r8a7778_add_hspi_device(int id);
			extern void r8a7778_add_mmc_device(struct sh_mmcif_plat_data *info);

	extern void r8a7778_init_delay(void);		extern void r8a7778_init_delay(void);
	extern void r8a7778_init_irq(void);		extern void r8a7778_init_irq(void);
	extern void r8a7778_init_irq_dt(void);		extern void r8a7778_init_irq_dt(void);

Admin message