Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5460290 authored by Sascha Hauer's avatar Sascha Hauer
Browse files

Merge branch 'features/ahci' into for-arnd-features

parents 976d1676 d870ea1d

arch/arm/mach-mx5/board-mx53_ard.c

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ static void __init mx53_ard_board_init(void) 
	imx53_add_imx_i2c(1, &mx53_ard_i2c2_data);

	imx53_add_imx_i2c(2, &mx53_ard_i2c3_data);

	imx_add_gpio_keys(&ard_button_data);

	imx53_add_ahci_imx();

}



static void __init mx53_ard_timer_init(void)

arch/arm/mach-mx5/board-mx53_loco.c

+1 −0
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ static void __init mx53_loco_board_init(void) 
	imx53_add_sdhci_esdhc_imx(2, &mx53_loco_sd3_data);

	imx_add_gpio_keys(&loco_button_data);

	gpio_led_register_device(-1, &mx53loco_leds_data);

	imx53_add_ahci_imx();

}



static void __init mx53_loco_timer_init(void)

arch/arm/mach-mx5/board-mx53_smd.c

+16 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "devices-imx53.h"



#define SMD_FEC_PHY_RST		IMX_GPIO_NR(7, 6)

#define MX53_SMD_SATA_PWR_EN    IMX_GPIO_NR(3, 3)



static iomux_v3_cfg_t mx53_smd_pads[] = {

	MX53_PAD_CSI0_DAT10__UART1_TXD_MUX,
@@ -111,6 +112,19 @@ static const struct imxi2c_platform_data mx53_smd_i2c_data __initconst = { 
	.bitrate = 100000,

};



static inline void mx53_smd_ahci_pwr_on(void)

{

	int ret;



	/* Enable SATA PWR */

	ret = gpio_request_one(MX53_SMD_SATA_PWR_EN,

			GPIOF_DIR_OUT | GPIOF_INIT_HIGH, "ahci-sata-pwr");

	if (ret) {

		pr_err("failed to enable SATA_PWR_EN: %d\n", ret);

		return;

	}

}



static void __init mx53_smd_board_init(void)

{

	imx53_soc_init();
@@ -125,6 +139,8 @@ static void __init mx53_smd_board_init(void) 
	imx53_add_sdhci_esdhc_imx(0, NULL);

	imx53_add_sdhci_esdhc_imx(1, NULL);

	imx53_add_sdhci_esdhc_imx(2, NULL);

	mx53_smd_ahci_pwr_on();

	imx53_add_ahci_imx();

}



static void __init mx53_smd_timer_init(void)

arch/arm/mach-mx5/clock-mx51-mx53.c

+19 −0
Original line number Diff line number Diff line
@@ -1401,6 +1401,22 @@ static struct clk esdhc4_mx53_clk = { 
	.secondary = &esdhc4_ipg_clk,

};



static struct clk sata_clk = {

	.parent = &ipg_clk,

	.enable = _clk_max_enable,

	.enable_reg = MXC_CCM_CCGR4,

	.enable_shift = MXC_CCM_CCGRx_CG1_OFFSET,

	.disable = _clk_max_disable,

};



static struct clk ahci_phy_clk = {

	.parent = &usb_phy1_clk,

};



static struct clk ahci_dma_clk = {

	.parent = &ahb_clk,

};



DEFINE_CLOCK(mipi_esc_clk, 0, MXC_CCM_CCGR4, MXC_CCM_CCGRx_CG5_OFFSET, NULL, NULL, NULL, &pll2_sw_clk);

DEFINE_CLOCK(mipi_hsc2_clk, 0, MXC_CCM_CCGR4, MXC_CCM_CCGRx_CG4_OFFSET, NULL, NULL, &mipi_esc_clk, &pll2_sw_clk);

DEFINE_CLOCK(mipi_hsc1_clk, 0, MXC_CCM_CCGR4, MXC_CCM_CCGRx_CG3_OFFSET, NULL, NULL, &mipi_hsc2_clk, &pll2_sw_clk);
@@ -1507,6 +1523,9 @@ static struct clk_lookup mx53_lookups[] = { 
	_REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)

	_REGISTER_CLOCK("imx-ssi.2", NULL, ssi3_clk)

	_REGISTER_CLOCK("imx-keypad", NULL, dummy_clk)

	_REGISTER_CLOCK("imx53-ahci.0", "ahci", sata_clk)

	_REGISTER_CLOCK("imx53-ahci.0", "ahci_phy", ahci_phy_clk)

	_REGISTER_CLOCK("imx53-ahci.0", "ahci_dma", ahci_dma_clk)

};



static void clk_tree_init(void)

arch/arm/mach-mx5/devices-imx53.h

+2 −0
Original line number Diff line number Diff line
@@ -40,3 +40,5 @@ extern const struct imx_imx_ssi_data imx53_imx_ssi_data[]; 
extern const struct imx_imx_keypad_data imx53_imx_keypad_data;

#define imx53_add_imx_keypad(pdata)	\

	imx_add_imx_keypad(&imx53_imx_keypad_data, pdata)



extern struct platform_device *__init imx53_add_ahci_imx(void);