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

Commit bfaddb7d authored by Stephen Boyd's avatar Stephen Boyd Committed by Greg Kroah-Hartman
Browse files

msm_serial: Switch clock consumer strings and simplify code 



In downstream kernel we've standardized the clock consumer names
that MSM device drivers use. Replace the uart specific clock
names in this driver with the more standard 'core' and 'iface'
names. Also simplify the code by assuming that clk_prepare_enable
and clk_disable_unprepare() will properly check for NULL pointers
(it will because MSM uses the common clock framework).

Cc: David Brown <davidb@codeaurora.org>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent de49df58

arch/arm/mach-msm/devices-msm7x00.c

+3 −3
Original line number Diff line number Diff line
@@ -456,9 +456,9 @@ static struct clk_pcom_desc msm_clocks_7x01a[] = { 
	CLK_PCOM("tsif_ref_clk",	TSIF_REF_CLK,	NULL, 0),

	CLK_PCOM("tv_dac_clk",	TV_DAC_CLK,	NULL, 0),

	CLK_PCOM("tv_enc_clk",	TV_ENC_CLK,	NULL, 0),

	CLK_PCOM("uart_clk",	UART1_CLK,	"msm_serial.0", OFF),

	CLK_PCOM("uart_clk",	UART2_CLK,	"msm_serial.1", 0),

	CLK_PCOM("uart_clk",	UART3_CLK,	"msm_serial.2", OFF),

	CLK_PCOM("core",	UART1_CLK,	"msm_serial.0", OFF),

	CLK_PCOM("core",	UART2_CLK,	"msm_serial.1", 0),

	CLK_PCOM("core",	UART3_CLK,	"msm_serial.2", OFF),

	CLK_PCOM("uart1dm_clk",	UART1DM_CLK,	NULL, OFF),

	CLK_PCOM("uart2dm_clk",	UART2DM_CLK,	NULL, 0),

	CLK_PCOM("usb_hs_clk",	USB_HS_CLK,	"msm_hsusb", OFF),

arch/arm/mach-msm/devices-msm7x30.c

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static struct clk_pcom_desc msm_clocks_7x30[] = { 
	CLK_PCOM("spi_pclk",	SPI_P_CLK,	NULL, 0),

	CLK_PCOM("tv_dac_clk",	TV_DAC_CLK,	NULL, 0),

	CLK_PCOM("tv_enc_clk",	TV_ENC_CLK,	NULL, 0),

	CLK_PCOM("uart_clk",	UART2_CLK,	"msm_serial.1", 0),

	CLK_PCOM("core",	UART2_CLK,	"msm_serial.1", 0),

	CLK_PCOM("usb_phy_clk",	USB_PHY_CLK,	NULL, 0),

	CLK_PCOM("usb_hs_clk",		USB_HS_CLK,		NULL, OFF),

	CLK_PCOM("usb_hs_pclk",		USB_HS_P_CLK,		NULL, OFF),

arch/arm/mach-msm/devices-qsd8x50.c

+3 −3
Original line number Diff line number Diff line
@@ -358,9 +358,9 @@ static struct clk_pcom_desc msm_clocks_8x50[] = { 
	CLK_PCOM("tsif_ref_clk",	TSIF_REF_CLK,	NULL, 0),

	CLK_PCOM("tv_dac_clk",	TV_DAC_CLK,	NULL, 0),

	CLK_PCOM("tv_enc_clk",	TV_ENC_CLK,	NULL, 0),

	CLK_PCOM("uart_clk",	UART1_CLK,	NULL, OFF),

	CLK_PCOM("uart_clk",	UART2_CLK,	NULL, 0),

	CLK_PCOM("uart_clk",	UART3_CLK,	"msm_serial.2", OFF),

	CLK_PCOM("core",	UART1_CLK,	NULL, OFF),

	CLK_PCOM("core",	UART2_CLK,	NULL, 0),

	CLK_PCOM("core",	UART3_CLK,	"msm_serial.2", OFF),

	CLK_PCOM("uartdm_clk",	UART1DM_CLK,	NULL, OFF),

	CLK_PCOM("uartdm_clk",	UART2DM_CLK,	NULL, 0),

	CLK_PCOM("usb_hs_clk",	USB_HS_CLK,	NULL, OFF),

drivers/tty/serial/msm_serial.c

+5 −14
Original line number Diff line number Diff line
@@ -422,7 +422,6 @@ static void msm_init_clock(struct uart_port *port) 
	struct msm_port *msm_port = UART_TO_MSM(port);



	clk_prepare_enable(msm_port->clk);

	if (!IS_ERR(msm_port->pclk))

	clk_prepare_enable(msm_port->pclk);

	msm_serial_set_mnd_regs(port);

}
@@ -701,12 +700,10 @@ static void msm_power(struct uart_port *port, unsigned int state, 
	switch (state) {

	case 0:

		clk_prepare_enable(msm_port->clk);

		if (!IS_ERR(msm_port->pclk))

		clk_prepare_enable(msm_port->pclk);

		break;

	case 3:

		clk_disable_unprepare(msm_port->clk);

		if (!IS_ERR(msm_port->pclk))

		clk_disable_unprepare(msm_port->pclk);

		break;

	default:
@@ -895,18 +892,12 @@ static int __init msm_serial_probe(struct platform_device *pdev) 
	else

		msm_port->is_uartdm = 0;



	if (msm_port->is_uartdm) {

		msm_port->clk = devm_clk_get(&pdev->dev, "gsbi_uart_clk");

		msm_port->pclk = devm_clk_get(&pdev->dev, "gsbi_pclk");

	} else {

		msm_port->clk = devm_clk_get(&pdev->dev, "uart_clk");

		msm_port->pclk = ERR_PTR(-ENOENT);

	}



	msm_port->clk = devm_clk_get(&pdev->dev, "core");

	if (IS_ERR(msm_port->clk))

		return PTR_ERR(msm_port->clk);



	if (msm_port->is_uartdm) {

		msm_port->pclk = devm_clk_get(&pdev->dev, "iface");

		if (IS_ERR(msm_port->pclk))

			return PTR_ERR(msm_port->pclk);