davinci: da850: add SATA support
Subsystems (4)
cover davinci: da850: add SATA support
This series add support for platform AHCI driver on DA850/OMAP-L138/AM18x. Towards this purpose, it also adds support for forced module transtitions on PSC.
Sekhar Nori (5):
davinci: psc.h: clean up indentation done using spaces
davinci: pass clock flags to davinci_psc_config()
davinci: enable forced transitions on PSC
davinci: da850: add support for SATA interface
davinci: da850 evm: register SATA device
arch/arm/mach-davinci/board-da850-evm.c | 7 ++ arch/arm/mach-davinci/clock.c | 8 +- arch/arm/mach-davinci/clock.h | 1 + arch/arm/mach-davinci/da850.c | 9 ++ arch/arm/mach-davinci/devices-da8xx.c | 126 +++++++++++++++++++++++ arch/arm/mach-davinci/include/mach/da8xx.h | 2 + arch/arm/mach-davinci/include/mach/psc.h | 151 ++++++++++++++-------------- arch/arm/mach-davinci/psc.c | 14 +++- 8 files changed, 237 insertions(+), 81 deletions(-)
Signature · 1 line
1.7.3.2
PATCH 1/5 davinci: psc.h: clean up indentation done using spaces
psc.h has indentation using spaces at a number of places. Fix this by indenting using tabs instead.
--- arch/arm/mach-davinci/include/mach/psc.h | 148 +++++++++++++++--------------- 1 files changed, 74 insertions(+), 74 deletions(-)
arch/arm/mach-davinci/include/mach/psc.h +74 -74
@@ -30,47 +30,47 @@#define DAVINCI_PWR_SLEEP_CNTRL_BASE 0x01C41000/* Power and Sleep Controller (PSC) Domains */ -#define DAVINCI_GPSC_ARMDOMAIN 0 -#define DAVINCI_GPSC_DSPDOMAIN 1 +#define DAVINCI_GPSC_ARMDOMAIN 0 +#define DAVINCI_GPSC_DSPDOMAIN 1 -#define DAVINCI_LPSC_VPSSMSTR 0 -#define DAVINCI_LPSC_VPSSSLV 1 -#define DAVINCI_LPSC_TPCC 2 -#define DAVINCI_LPSC_TPTC0 3 -#define DAVINCI_LPSC_TPTC1 4 -#define DAVINCI_LPSC_EMAC 5 -#define DAVINCI_LPSC_EMAC_WRAPPER 6 -#define DAVINCI_LPSC_USB 9 -#define DAVINCI_LPSC_ATA 10 -#define DAVINCI_LPSC_VLYNQ 11 -#define DAVINCI_LPSC_UHPI 12 -#define DAVINCI_LPSC_DDR_EMIF 13 -#define DAVINCI_LPSC_AEMIF 14 -#define DAVINCI_LPSC_MMC_SD 15 -#define DAVINCI_LPSC_McBSP 17 -#define DAVINCI_LPSC_I2C 18 -#define DAVINCI_LPSC_UART0 19 -#define DAVINCI_LPSC_UART1 20 -#define DAVINCI_LPSC_UART2 21 -#define DAVINCI_LPSC_SPI 22 -#define DAVINCI_LPSC_PWM0 23 -#define DAVINCI_LPSC_PWM1 24 -#define DAVINCI_LPSC_PWM2 25 -#define DAVINCI_LPSC_GPIO 26 -#define DAVINCI_LPSC_TIMER0 27 -#define DAVINCI_LPSC_TIMER1 28 -#define DAVINCI_LPSC_TIMER2 29 -#define DAVINCI_LPSC_SYSTEM_SUBSYS 30 -#define DAVINCI_LPSC_ARM 31 -#define DAVINCI_LPSC_SCR2 32 -#define DAVINCI_LPSC_SCR3 33 -#define DAVINCI_LPSC_SCR4 34 -#define DAVINCI_LPSC_CROSSBAR 35 -#define DAVINCI_LPSC_CFG27 36 -#define DAVINCI_LPSC_CFG3 37 -#define DAVINCI_LPSC_CFG5 38 -#define DAVINCI_LPSC_GEM 39 -#define DAVINCI_LPSC_IMCOP 40 +#define DAVINCI_LPSC_VPSSMSTR 0 +#define DAVINCI_LPSC_VPSSSLV 1 +#define DAVINCI_LPSC_TPCC 2 +#define DAVINCI_LPSC_TPTC0 3 +#define DAVINCI_LPSC_TPTC1 4 +#define DAVINCI_LPSC_EMAC 5 +#define DAVINCI_LPSC_EMAC_WRAPPER 6 +#define DAVINCI_LPSC_USB 9 +#define DAVINCI_LPSC_ATA 10 +#define DAVINCI_LPSC_VLYNQ 11 +#define DAVINCI_LPSC_UHPI 12 +#define DAVINCI_LPSC_DDR_EMIF 13 +#define DAVINCI_LPSC_AEMIF 14 +#define DAVINCI_LPSC_MMC_SD 15 +#define DAVINCI_LPSC_McBSP 17 +#define DAVINCI_LPSC_I2C 18 +#define DAVINCI_LPSC_UART0 19 +#define DAVINCI_LPSC_UART1 20 +#define DAVINCI_LPSC_UART2 21 +#define DAVINCI_LPSC_SPI 22 +#define DAVINCI_LPSC_PWM0 23 +#define DAVINCI_LPSC_PWM1 24 +#define DAVINCI_LPSC_PWM2 25 +#define DAVINCI_LPSC_GPIO 26 +#define DAVINCI_LPSC_TIMER0 27 +#define DAVINCI_LPSC_TIMER1 28 +#define DAVINCI_LPSC_TIMER2 29 +#define DAVINCI_LPSC_SYSTEM_SUBSYS 30 +#define DAVINCI_LPSC_ARM 31 +#define DAVINCI_LPSC_SCR2 32 +#define DAVINCI_LPSC_SCR3 33 +#define DAVINCI_LPSC_SCR4 34 +#define DAVINCI_LPSC_CROSSBAR 35 +#define DAVINCI_LPSC_CFG27 36 +#define DAVINCI_LPSC_CFG3 37 +#define DAVINCI_LPSC_CFG5 38 +#define DAVINCI_LPSC_GEM 39 +#define DAVINCI_LPSC_IMCOP 40#define DM355_LPSC_TIMER3 5#define DM355_LPSC_SPI1 6
@@ -102,39 +102,39 @@/* * LPSC Assignments */ -#define DM646X_LPSC_ARM 0 -#define DM646X_LPSC_C64X_CPU 1 -#define DM646X_LPSC_HDVICP0 2 -#define DM646X_LPSC_HDVICP1 3 -#define DM646X_LPSC_TPCC 4 -#define DM646X_LPSC_TPTC0 5 -#define DM646X_LPSC_TPTC1 6 -#define DM646X_LPSC_TPTC2 7 -#define DM646X_LPSC_TPTC3 8 -#define DM646X_LPSC_PCI 13 -#define DM646X_LPSC_EMAC 14 -#define DM646X_LPSC_VDCE 15 -#define DM646X_LPSC_VPSSMSTR 16 -#define DM646X_LPSC_VPSSSLV 17 -#define DM646X_LPSC_TSIF0 18 -#define DM646X_LPSC_TSIF1 19 -#define DM646X_LPSC_DDR_EMIF 20 -#define DM646X_LPSC_AEMIF 21 -#define DM646X_LPSC_McASP0 22 -#define DM646X_LPSC_McASP1 23 -#define DM646X_LPSC_CRGEN0 24 -#define DM646X_LPSC_CRGEN1 25 -#define DM646X_LPSC_UART0 26 -#define DM646X_LPSC_UART1 27 -#define DM646X_LPSC_UART2 28 -#define DM646X_LPSC_PWM0 29 -#define DM646X_LPSC_PWM1 30 -#define DM646X_LPSC_I2C 31 -#define DM646X_LPSC_SPI 32 -#define DM646X_LPSC_GPIO 33 -#define DM646X_LPSC_TIMER0 34 -#define DM646X_LPSC_TIMER1 35 -#define DM646X_LPSC_ARM_INTC 45 +#define DM646X_LPSC_ARM 0 +#define DM646X_LPSC_C64X_CPU 1 +#define DM646X_LPSC_HDVICP0 2 +#define DM646X_LPSC_HDVICP1 3 +#define DM646X_LPSC_TPCC 4 +#define DM646X_LPSC_TPTC0 5 +#define DM646X_LPSC_TPTC1 6 +#define DM646X_LPSC_TPTC2 7 +#define DM646X_LPSC_TPTC3 8 +#define DM646X_LPSC_PCI 13 +#define DM646X_LPSC_EMAC 14 +#define DM646X_LPSC_VDCE 15 +#define DM646X_LPSC_VPSSMSTR 16 +#define DM646X_LPSC_VPSSSLV 17 +#define DM646X_LPSC_TSIF0 18 +#define DM646X_LPSC_TSIF1 19 +#define DM646X_LPSC_DDR_EMIF 20 +#define DM646X_LPSC_AEMIF 21 +#define DM646X_LPSC_McASP0 22 +#define DM646X_LPSC_McASP1 23 +#define DM646X_LPSC_CRGEN0 24 +#define DM646X_LPSC_CRGEN1 25 +#define DM646X_LPSC_UART0 26 +#define DM646X_LPSC_UART1 27 +#define DM646X_LPSC_UART2 28 +#define DM646X_LPSC_PWM0 29 +#define DM646X_LPSC_PWM1 30 +#define DM646X_LPSC_I2C 31 +#define DM646X_LPSC_SPI 32 +#define DM646X_LPSC_GPIO 33 +#define DM646X_LPSC_TIMER0 34 +#define DM646X_LPSC_TIMER1 35 +#define DM646X_LPSC_ARM_INTC 45/* PSC0 defines */ #define DA8XX_LPSC0_TPCC 0
@@ -243,7 +243,7 @@#define PSC_STATE_DISABLE 2#define PSC_STATE_ENABLE 3 -#define MDSTAT_STATE_MASK 0x1f +#define MDSTAT_STATE_MASK 0x1f#ifndef __ASSEMBLER__
Signature · 1 line
1.7.3.2
PATCH 2/5 davinci: pass clock flags to davinci_psc_config()
In reply to Sekhar NoriEnabling or disabling a PSC can take certain modifiers like "disable with reset", "force enable/disable" and "enable/disable with local reset" apart from the regular clock gating functionality.
Pass a flags argument to davinci_psc_config() so these variations can be supported there.
At this time only "disable with reset" is supported, but other functionality will be added in subsequent patches.
--- arch/arm/mach-davinci/clock.c | 8 +++----- arch/arm/mach-davinci/include/mach/psc.h | 2 +- arch/arm/mach-davinci/psc.c | 12 +++++++++++- 3 files changed, 15 insertions(+), 7 deletions(-)
arch/arm/mach-davinci/clock.c +3 -5
@@ -44,7 +44,7 @@ static void __clk_enable(struct clk *clk)__clk_enable (clk->parent);if (clk->usecount++ ==0 && (clk->flags &CLK_PSC ))davinci_psc_config (psc_domain (clk), clk->gpsc, clk->lpsc, -PSC_STATE_ENABLE ); + true, clk->flags); }static void __clk_disable (struct clk *clk)
@@ -54,8 +54,7 @@ static void __clk_disable(struct clk *clk)if (--clk->usecount ==0 && !(clk->flags &CLK_PLL ) && (clk->flags &CLK_PSC ))davinci_psc_config (psc_domain (clk), clk->gpsc, clk->lpsc, - (clk->flags &PSC_SWRSTDISABLE ) ? -PSC_STATE_SWRSTDISABLE :PSC_STATE_DISABLE ); + false, clk->flags);if (clk->parent)__clk_disable (clk->parent); }
@@ -239,8 +238,7 @@ static int __init clk_disable_unused(void)pr_debug ("Clocks: disable unused %s\n" , ck->name);davinci_psc_config (psc_domain (ck), ck->gpsc, ck->lpsc, - (ck->flags &PSC_SWRSTDISABLE ) ? -PSC_STATE_SWRSTDISABLE :PSC_STATE_DISABLE ); + false, ck->flags); }spin_unlock_irq (&clockfw_lock);
arch/arm/mach-davinci/include/mach/psc.h +1 -1
@@ -249,7 +249,7 @@extern int davinci_psc_is_clk_active (unsigned int ctlr,unsigned int id);extern void davinci_psc_config (unsigned int domain,unsigned int ctlr, -unsigned int id,u32 next_state); +unsigned int id,bool enable,u32 flags);#endif
arch/arm/mach-davinci/psc.c +11 -1
@@ -25,6 +25,8 @@#include <mach/cputype.h> #include <mach/psc.h> +#include "clock.h" +/* Return nonzero iff the domain's clock is active */ int __init davinci_psc_is_clk_active (unsigned int ctlr,unsigned int id) {
@@ -48,11 +50,12 @@ int __init davinci_psc_is_clk_active(unsigned int ctlr, unsigned int id)/* Enable or disable a PSC domain */ void davinci_psc_config (unsigned int domain,unsigned int ctlr, -unsigned int id,u32 next_state) +unsigned int id,bool enable,u32 flags) {u32 epcpr, ptcmd, ptstat, pdstat, pdctl1, mdstat, mdctl;void __iomem *psc_base;struct davinci_soc_info *soc_info = &davinci_soc_info; +u32 next_state =PSC_STATE_ENABLE ;if (!soc_info->psc_bases || (ctlr >= soc_info->psc_bases_num)) { pr_warning("PSC: Bad psc data: 0x%x[%d]\n",
@@ -62,6 +65,13 @@ void davinci_psc_config(unsigned int domain, unsigned int ctlr, psc_base =ioremap (soc_info->psc_bases[ctlr],SZ_4K ); +if (!enable) { +if (flags &PSC_SWRSTDISABLE ) + next_state =PSC_STATE_SWRSTDISABLE ; +else + next_state =PSC_STATE_DISABLE ; + } + mdctl =__raw_readl (psc_base +MDCTL +4 * id); mdctl &= ~MDSTAT_STATE_MASK ; mdctl |= next_state;
Signature · 1 line
1.7.3.2
PATCH v2 3/5 davinci: enable forced transitions on PSC
In reply to Sekhar NoriSome DaVinci modules like the SATA on DA850 need forced module state transitions.
Define a "force" flag which can be passed to the PSC config function to enable it to make forced transitions.
Forced transitions shouldn't normally be attempted, unless the TRM explicitly specifies its usage.
ChangeLog:
v2:
Modified to take care of the fact that davinci_psc_config() now takes the flags directly.
--- arch/arm/mach-davinci/clock.h | 1 + arch/arm/mach-davinci/include/mach/psc.h | 1 + arch/arm/mach-davinci/psc.c | 2 ++ 3 files changed, 4 insertions(+), 0 deletions(-)
arch/arm/mach-davinci/clock.h +1 -0
@@ -111,6 +111,7 @@ struct clk {#define CLK_PLL BIT(4)/* PLL-derived clock */ #define PRE_PLL BIT(5)/* source is before PLL mult/div */ #define PSC_SWRSTDISABLE BIT(6)/* Disable state is SwRstDisable */ +#define PSC_FORCE BIT(7)/* Force module state transtition */ #define CLK (dev, con, ck) \ { \
arch/arm/mach-davinci/include/mach/psc.h +1 -0
@@ -244,6 +244,7 @@#define PSC_STATE_ENABLE 3#define MDSTAT_STATE_MASK 0x1f +#define MDCTL_FORCE BIT(31)#ifndef __ASSEMBLER__
arch/arm/mach-davinci/psc.c +2 -0
@@ -75,6 +75,8 @@ void davinci_psc_config(unsigned int domain, unsigned int ctlr, mdctl =__raw_readl (psc_base +MDCTL +4 * id); mdctl &= ~MDSTAT_STATE_MASK ; mdctl |= next_state; +if (flags &PSC_FORCE ) + mdctl |=MDCTL_FORCE ;__raw_writel (mdctl, psc_base +MDCTL +4 * id); pdstat =__raw_readl (psc_base +PDSTAT );
Signature · 1 line
1.7.3.2
PATCH v3 4/5 davinci: da850: add support for SATA interface
In reply to Sekhar NoriAdd support for SATA controller on the
DA850/OMAP-L138/AM18x devices.
The patch adds the necessary clocks, platform resources and a routine to initialize the SATA controller.
The PHY configuration in this patch is courtesy the work done by Zegeye Alemu, Swaminathan and Mansoor Ahamed from TI.
While testing this patch, enable port multiplier support iff you are actually using one. The reasons of this behaviour are discussed
here: http://patchwork.ozlabs.org/patch/78163/
ChangeLog:
v3:
Removed fields which were being initialized to zero in PHY configuration. Moved SATA base address definition to the top of the file to make it inline with what is done for the rest of the modules.
v2:
Addressed comments from Sergei. Removed unnecessary braces and removed unnecessary else after goto.
--- arch/arm/mach-davinci/da850.c | 9 ++ arch/arm/mach-davinci/devices-da8xx.c | 126 ++++++++++++++++++++++++++++ arch/arm/mach-davinci/include/mach/da8xx.h | 2 + 3 files changed, 137 insertions(+), 0 deletions(-)
arch/arm/mach-davinci/da850.c +9 -0
@@ -373,6 +373,14 @@ static struct clk spi1_clk = { .flags = DA850_CLK_ASYNC3, }; +static struct clk sata_clk = { + .name ="sata" , + .parent = &pll0_sysclk2, + .lpsc =DA850_LPSC1_SATA , + .gpsc =1 , + .flags =PSC_FORCE , +}; +static struct clk_lookup da850_clks[] = {CLK (NULL ,"ref" , &ref_clk),CLK (NULL ,"pll0" , &pll0_clk),
@@ -419,6 +427,7 @@ static struct clk_lookup da850_clks[] = {CLK (NULL ,"usb20" , &usb20_clk),CLK ("spi_davinci.0" ,NULL , &spi0_clk),CLK ("spi_davinci.1" ,NULL , &spi1_clk), +CLK ("ahci" ,NULL , &sata_clk), CLK(NULL, NULL, NULL), };
arch/arm/mach-davinci/devices-da8xx.c +126 -0
141 lines not on this page · raw message
arch/arm/mach-davinci/include/mach/da8xx.h +2 -0
@@ -57,6 +57,7 @@ extern unsigned int da850_max_speed;#define DA8XX_SYSCFG1_BASE (IO_PHYS + 0x22C000)#define DA8XX_SYSCFG1_VIRT (x) (da8xx_syscfg1_base + (x))#define DA8XX_DEEPSLEEP_REG 0x8 +#define DA8XX_PWRDN_REG 0x18#define DA8XX_PSC0_BASE 0x01c10000#define DA8XX_PLL0_BASE 0x01c11000
@@ -89,6 +90,7 @@ int da850_register_cpufreq(char *async_clk);int da8xx_register_cpuidle (void );void __iomem *__init da8xx_get_mem_ctlr (void );int da850_register_pm (struct platform_device *pdev); +int __init da850_register_sata (unsigned long refclkpn);extern struct platform_device da8xx_serial_device;extern struct emac_platform_data da8xx_emac_pdata;
Signature · 1 line
1.7.3.2
PATCH 5/5 davinci: da850 evm: register SATA device
In reply to Sekhar NoriRegister the platform device for SATA interface
present on the DA850/OMAP-L138/AM18x EVM.
--- arch/arm/mach-davinci/board-da850-evm.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
arch/arm/mach-davinci/board-da850-evm.c +7 -0
@@ -1117,6 +1117,8 @@ static __init int da850_evm_init_cpufreq(void)static __init int da850_evm_init_cpufreq (void ) {return 0 ; }#endif +#define DA850EVM_SATA_REFCLKPN_RATE (100 * 1000 * 1000) +static __init void da850_evm_init (void ) {int ret;
@@ -1237,6 +1239,11 @@ static __init void da850_evm_init(void)if (ret)pr_warning ("da850_evm_init: spi 1 registration failed: %d\n" , ret); + + ret =da850_register_sata (DA850EVM_SATA_REFCLKPN_RATE ); +if (ret) +pr_warning ("da850_evm_init: sata registration failed: %d\n" , + ret); }#ifdef CONFIG_SERIAL_8250_CONSOLE
Signature · 1 line
1.7.3.2