On Thu, Feb 06, 2014 at 04:01:25PM +0800, Kishon Vijay Abraham I wrote: > Hi, > > On Thursday 06 February 2014 12:30 PM, Pratyush Anand wrote: > > On Thu, Feb 06, 2014 at 02:32:42PM +0800, Kishon Vijay Abraham I wrote: > >> Hi, > >> > >> On Thursday 06 February 2014 10:14 AM, Pratyush Anand wrote: > >>> ahci driver needs some platform specific functions which are called at > >>> init, exit, suspend and resume conditions. Till now these functions were > >>> present in a platform driver with a fixme notes. > >>> > >>> Similar functions modifying same set of registers will also be needed in > >>> case of PCIe phy init/exit. > >>> > >>> So move all these SATA platform code to phy-miphy40lp driver. > >>> > >>> Signed-off-by: Pratyush Anand <pratyush.anand@xxxxxx> > >>> Tested-by: Mohit Kumar <mohit.kumar@xxxxxx> > >>> Cc: Viresh Kumar <viresh.linux@xxxxxxxxx> > >>> Cc: Tejun Heo <tj@xxxxxxxxxx> > >>> Cc: Arnd Bergmann <arnd@xxxxxxxx> > >>> Cc: Kishon Vijay Abraham I <kishon@xxxxxx> > >>> Cc: spear-devel@xxxxxxxxxxx > >>> Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx > >>> Cc: devicetree@xxxxxxxxxxxxxxx > >>> Cc: linux-ide@xxxxxxxxxxxxxxx > >>> Cc: linux-kernel@xxxxxxxxxxxxxxx > >>> --- > >>> .../devicetree/bindings/arm/spear-misc.txt | 4 + > >>> arch/arm/boot/dts/spear1310-evb.dts | 4 + > >>> arch/arm/boot/dts/spear1310.dtsi | 39 +++- > >>> arch/arm/boot/dts/spear1340-evb.dts | 4 + > >>> arch/arm/boot/dts/spear1340.dtsi | 13 +- > >>> arch/arm/boot/dts/spear13xx.dtsi | 5 + > >>> arch/arm/mach-spear/Kconfig | 2 + > >>> arch/arm/mach-spear/spear1340.c | 127 +------------ > >>> drivers/phy/phy-miphy40lp.c | 204 ++++++++++++++++++++- > >> > >> It would be better if you can split this patch. Keep arch/ in separate patch > >> and drivers/ in separate patch. > > > > Code is actually moving from arch to driver. Therefore I kept it in > > same patch. > > > >>> 9 files changed, 266 insertions(+), 136 deletions(-) > >>> create mode 100644 Documentation/devicetree/bindings/arm/spear-misc.txt > >>> > >> . > >> . > >> <snip> > >> . > >> . > >>> static const char * const spear1340_dt_board_compat[] = { > >>> diff --git a/drivers/phy/phy-miphy40lp.c b/drivers/phy/phy-miphy40lp.c > >>> index d478c14..cc7f45d 100644 > >>> --- a/drivers/phy/phy-miphy40lp.c > >>> +++ b/drivers/phy/phy-miphy40lp.c > >>> @@ -8,6 +8,7 @@ > >>> * it under the terms of the GNU General Public License version 2 as > >>> * published by the Free Software Foundation. > >>> * > >>> + * 04/02/2014: Adding support of SATA mode for SPEAr1340. > >>> */ > >>> > >>> #include <linux/delay.h> > >>> @@ -19,6 +20,60 @@ > >>> #include <linux/phy/phy.h> > >>> #include <linux/regmap.h> > >>> > >>> +/* SPEAr1340 Registers */ > >>> +/* Power Management Registers */ > >>> +#define SPEAR1340_PCM_CFG 0x100 > >>> + #define SPEAR1340_PCM_CFG_SATA_POWER_EN 0x800 > >>> +#define SPEAR1340_PCM_WKUP_CFG 0x104 > >>> +#define SPEAR1340_SWITCH_CTR 0x108 > >>> + > >>> +#define SPEAR1340_PERIP1_SW_RST 0x318 > >>> + #define SPEAR1340_PERIP1_SW_RST_SATA 0x1000 > >>> +#define SPEAR1340_PERIP2_SW_RST 0x31C > >>> +#define SPEAR1340_PERIP3_SW_RST 0x320 > >>> + > >>> +/* PCIE - SATA configuration registers */ > >>> +#define SPEAR1340_PCIE_SATA_CFG 0x424 > >>> + /* PCIE CFG MASks */ > >>> + #define SPEAR1340_PCIE_CFG_DEVICE_PRESENT (1 << 11) > >> > >> use BIT() wherever possible. > > > > OK. > > > >>> + #define SPEAR1340_PCIE_CFG_POWERUP_RESET (1 << 10) > >>> + #define SPEAR1340_PCIE_CFG_CORE_CLK_EN (1 << 9) > >>> + #define SPEAR1340_PCIE_CFG_AUX_CLK_EN (1 << 8) > >>> + #define SPEAR1340_SATA_CFG_TX_CLK_EN (1 << 4) > >>> + #define SPEAR1340_SATA_CFG_RX_CLK_EN (1 << 3) > >>> + #define SPEAR1340_SATA_CFG_POWERUP_RESET (1 << 2) > >>> + #define SPEAR1340_SATA_CFG_PM_CLK_EN (1 << 1) > >>> + #define SPEAR1340_PCIE_SATA_SEL_PCIE (0) > >>> + #define SPEAR1340_PCIE_SATA_SEL_SATA (1) > >>> + #define SPEAR1340_PCIE_SATA_CFG_MASK 0xF1F > >>> + #define SPEAR1340_PCIE_CFG_VAL (SPEAR1340_PCIE_SATA_SEL_PCIE | \ > >>> + SPEAR1340_PCIE_CFG_AUX_CLK_EN | \ > >>> + SPEAR1340_PCIE_CFG_CORE_CLK_EN | \ > >>> + SPEAR1340_PCIE_CFG_POWERUP_RESET | \ > >>> + SPEAR1340_PCIE_CFG_DEVICE_PRESENT) > >>> + #define SPEAR1340_SATA_CFG_VAL (SPEAR1340_PCIE_SATA_SEL_SATA | \ > >>> + SPEAR1340_SATA_CFG_PM_CLK_EN | \ > >>> + SPEAR1340_SATA_CFG_POWERUP_RESET | \ > >>> + SPEAR1340_SATA_CFG_RX_CLK_EN | \ > >>> + SPEAR1340_SATA_CFG_TX_CLK_EN) > >>> + > >>> +#define SPEAR1340_PCIE_MIPHY_CFG 0x428 > >>> + #define SPEAR1340_MIPHY_OSC_BYPASS_EXT (1 << 31) > >>> + #define SPEAR1340_MIPHY_CLK_REF_DIV2 (1 << 27) > >>> + #define SPEAR1340_MIPHY_CLK_REF_DIV4 (2 << 27) > >>> + #define SPEAR1340_MIPHY_CLK_REF_DIV8 (3 << 27) > >>> + #define SPEAR1340_MIPHY_PLL_RATIO_TOP(x) (x << 0) > >>> + #define SPEAR1340_PCIE_MIPHY_CFG_MASK 0xF80000FF > >>> + #define SPEAR1340_PCIE_SATA_MIPHY_CFG_SATA \ > >>> + (SPEAR1340_MIPHY_OSC_BYPASS_EXT | \ > >>> + SPEAR1340_MIPHY_CLK_REF_DIV2 | \ > >>> + SPEAR1340_MIPHY_PLL_RATIO_TOP(60)) > >>> + #define SPEAR1340_PCIE_SATA_MIPHY_CFG_SATA_25M_CRYSTAL_CLK \ > >>> + (SPEAR1340_MIPHY_PLL_RATIO_TOP(120)) > >>> + #define SPEAR1340_PCIE_SATA_MIPHY_CFG_PCIE \ > >>> + (SPEAR1340_MIPHY_OSC_BYPASS_EXT | \ > >>> + SPEAR1340_MIPHY_PLL_RATIO_TOP(25)) > >>> + > >>> enum phy_mode { > >>> SATA, > >>> PCIE, > >>> @@ -38,28 +93,145 @@ struct st_miphy40lp_priv { > >>> u32 id; > >>> }; > >>> > >>> +static int spear1340_sata_miphy_init(struct st_miphy40lp_priv *phypriv) > >> > >> The function name format here differs from what you have already added. It will > >> be good to have consistent name in the file. > > > > You mean to pass "struct phy *phy" in all the internal functions too? > > No. I meant let all the function names begin with miphy40lp_. okkk.. miphy40lp_spear1340_sata_init looks better :) Rgds Pratyush -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html