Commit d927daf5 authored by Pawel Moll's avatar Pawel Moll
Browse files

ARM: vexpress: Check master site in daughterboard's sysctl operations 



With recent enough motherboard firmware, core tile can be fitted
in either of the two daughterboard sites. The non-DT tile code for
V2P-CA9 did not check that when configuring DVI output nor setting
CLCD pixel clock.

Fixed now, providing "get master site" API in motherboard's code.

Signed-off-by: default avatarPawel Moll <pawel.moll@arm.com>
parent ef591196

arch/arm/mach-vexpress/ct-ca9x4.c

+12 −3
Original line number Original line Diff line number Diff line
@@ -66,8 +66,15 @@ static void __init ct_ca9x4_init_irq(void) 




static void ct_ca9x4_clcd_enable(struct clcd_fb *fb)

static void ct_ca9x4_clcd_enable(struct clcd_fb *fb)

{

{

	v2m_cfg_write(SYS_CFG_MUXFPGA | SYS_CFG_SITE_DB1, 0);

	u32 site = v2m_get_master_site();

	v2m_cfg_write(SYS_CFG_DVIMODE | SYS_CFG_SITE_DB1, 2);



	/*

	 * Old firmware was using the "site" component of the command

	 * to control the DVI muxer (while it should be always 0 ie. MB).

	 * Newer firmware uses the data register. Keep both for compatibility.

	 */

	v2m_cfg_write(SYS_CFG_MUXFPGA | SYS_CFG_SITE(site), site);

	v2m_cfg_write(SYS_CFG_DVIMODE | SYS_CFG_SITE(SYS_CFG_SITE_MB), 2);

}

}





static int ct_ca9x4_clcd_setup(struct clcd_fb *fb)

static int ct_ca9x4_clcd_setup(struct clcd_fb *fb)
@@ -112,7 +119,9 @@ static long ct_round(struct clk *clk, unsigned long rate) 




static int ct_set(struct clk *clk, unsigned long rate)

static int ct_set(struct clk *clk, unsigned long rate)

{

{

	return v2m_cfg_write(SYS_CFG_OSC | SYS_CFG_SITE_DB1 | 1, rate);

	u32 site = v2m_get_master_site();



	return v2m_cfg_write(SYS_CFG_OSC | SYS_CFG_SITE(site) | 1, rate);

}

}





static const struct clk_ops osc1_clk_ops = {

static const struct clk_ops osc1_clk_ops = {

arch/arm/mach-vexpress/include/mach/motherboard.h

+6 −3
Original line number Original line Diff line number Diff line
@@ -104,9 +104,10 @@ 
#define SYS_CFG_REBOOT		(9 << 20)

#define SYS_CFG_REBOOT		(9 << 20)

#define SYS_CFG_DVIMODE		(11 << 20)

#define SYS_CFG_DVIMODE		(11 << 20)

#define SYS_CFG_POWER		(12 << 20)

#define SYS_CFG_POWER		(12 << 20)

#define SYS_CFG_SITE_MB		(0 << 16)

#define SYS_CFG_SITE(n)		((n) << 16)

#define SYS_CFG_SITE_DB1	(1 << 16)

#define SYS_CFG_SITE_MB		0

#define SYS_CFG_SITE_DB2	(2 << 16)

#define SYS_CFG_SITE_DB1	1

#define SYS_CFG_SITE_DB2	2

#define SYS_CFG_STACK(n)	((n) << 12)

#define SYS_CFG_STACK(n)	((n) << 12)





#define SYS_CFG_ERR		(1 << 1)

#define SYS_CFG_ERR		(1 << 1)
@@ -122,6 +123,8 @@ void v2m_flags_set(u32 data); 
#define SYS_MISC_MASTERSITE	(1 << 14)

#define SYS_MISC_MASTERSITE	(1 << 14)

#define SYS_PROCIDx_HBI_MASK	0xfff

#define SYS_PROCIDx_HBI_MASK	0xfff





int v2m_get_master_site(void);



/*

/*

 * Core tile IDs

 * Core tile IDs

 */

 */

arch/arm/mach-vexpress/v2m.c

+13 −5
Original line number Original line Diff line number Diff line
@@ -147,6 +147,13 @@ void __init v2m_flags_set(u32 data) 
	writel(data, v2m_sysreg_base + V2M_SYS_FLAGSSET);

	writel(data, v2m_sysreg_base + V2M_SYS_FLAGSSET);

}

}





int v2m_get_master_site(void)

{

	u32 misc = readl(v2m_sysreg_base + V2M_SYS_MISC);



	return misc & SYS_MISC_MASTERSITE ? SYS_CFG_SITE_DB2 : SYS_CFG_SITE_DB1;

}







static struct resource v2m_pcie_i2c_resource = {

static struct resource v2m_pcie_i2c_resource = {

	.start	= V2M_SERIAL_BUS_PCI,

	.start	= V2M_SERIAL_BUS_PCI,
@@ -326,7 +333,8 @@ static long v2m_osc_round(struct clk *clk, unsigned long rate) 




static int v2m_osc1_set(struct clk *clk, unsigned long rate)

static int v2m_osc1_set(struct clk *clk, unsigned long rate)

{

{

	return v2m_cfg_write(SYS_CFG_OSC | SYS_CFG_SITE_MB | 1, rate);

	return v2m_cfg_write(SYS_CFG_OSC | SYS_CFG_SITE(SYS_CFG_SITE_MB) | 1,

			rate);

}

}





static const struct clk_ops osc1_clk_ops = {

static const struct clk_ops osc1_clk_ops = {
@@ -404,13 +412,13 @@ static void __init v2m_init_early(void) 




static void v2m_power_off(void)

static void v2m_power_off(void)

{

{

	if (v2m_cfg_write(SYS_CFG_SHUTDOWN | SYS_CFG_SITE_MB, 0))

	if (v2m_cfg_write(SYS_CFG_SHUTDOWN | SYS_CFG_SITE(SYS_CFG_SITE_MB), 0))

		printk(KERN_EMERG "Unable to shutdown\n");

		printk(KERN_EMERG "Unable to shutdown\n");

}

}





static void v2m_restart(char str, const char *cmd)

static void v2m_restart(char str, const char *cmd)

{

{

	if (v2m_cfg_write(SYS_CFG_REBOOT | SYS_CFG_SITE_MB, 0))

	if (v2m_cfg_write(SYS_CFG_REBOOT | SYS_CFG_SITE(SYS_CFG_SITE_MB), 0))

		printk(KERN_EMERG "Unable to reboot\n");

		printk(KERN_EMERG "Unable to reboot\n");

}

}
@@ -605,8 +613,8 @@ void __init v2m_dt_init_early(void) 




	/* Confirm board type against DT property, if available */

	/* Confirm board type against DT property, if available */

	if (of_property_read_u32(allnodes, "arm,hbi", &dt_hbi) == 0) {

	if (of_property_read_u32(allnodes, "arm,hbi", &dt_hbi) == 0) {

		u32 misc = readl(v2m_sysreg_base + V2M_SYS_MISC);

		int site = v2m_get_master_site();

		u32 id = readl(v2m_sysreg_base + (misc & SYS_MISC_MASTERSITE ?

		u32 id = readl(v2m_sysreg_base + (site == SYS_CFG_SITE_DB2 ?

				V2M_SYS_PROCID1 : V2M_SYS_PROCID0));

				V2M_SYS_PROCID1 : V2M_SYS_PROCID0));

		u32 hbi = id & SYS_PROCIDx_HBI_MASK;

		u32 hbi = id & SYS_PROCIDx_HBI_MASK;

CRA Git | Maintained and supported by SUSTech CRA and CCSE