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

Commit b15e9e5a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mpq8092: msm-uart: cleanup auxdata for UART devices"

parents c768bd8d 040c4b37

arch/arm/mach-msm/board-8092.c

+0 −4
Original line number Diff line number Diff line
@@ -83,10 +83,6 @@ static void __init mpq8092_map_io(void) 
static struct of_dev_auxdata mpq8092_auxdata_lookup[] __initdata = {

	OF_DEV_AUXDATA("qcom,hsusb-otg", 0xF9A55000, \

			"msm_otg", NULL),

	OF_DEV_AUXDATA("qcom,msm-lsuart-v14", 0xF991F000, \

			"msm_serial_hsl.0", NULL),

	OF_DEV_AUXDATA("qcom,msm-lsuart-v14", 0xF9922000, \

			"msm_serial_hsl.1", NULL),

	OF_DEV_AUXDATA("qcom,msm-sdcc", 0xF9824000, \

			"msm_sdcc.1", NULL),

	OF_DEV_AUXDATA("qcom,msm-sdcc", 0xF98A4000, \

arch/arm/mach-msm/clock-8092.c

+4 −4
Original line number Diff line number Diff line
@@ -36,10 +36,10 @@ 
 * they need to control.

 */

static struct clk_lookup msm_clocks_8092[] = {

	CLK_DUMMY("core_clk",   BLSP1_UART_CLK, "msm_serial_hsl.0", OFF),

	CLK_DUMMY("iface_clk",  BLSP1_UART_CLK, "msm_serial_hsl.0", OFF),

	CLK_DUMMY("core_clk",   BLSP1_UART_CLK, "msm_serial_hsl.1", OFF),

	CLK_DUMMY("iface_clk",  BLSP1_UART_CLK, "msm_serial_hsl.1", OFF),

	CLK_DUMMY("core_clk",   BLSP1_UART2_CLK, "f991f000.serial", OFF),

	CLK_DUMMY("iface_clk",  BLSP1_UART2_CLK, "f991f000.serial", OFF),

	CLK_DUMMY("core_clk",   BLSP1_UART5_CLK, "f9922000.serial", OFF),

	CLK_DUMMY("iface_clk",  BLSP1_UART5_CLK, "f9922000.serial", OFF),

	CLK_DUMMY("core_clk",	SDC1_CLK,	"msm_sdcc.1", OFF),

	CLK_DUMMY("iface_clk",	SDC1_P_CLK,	"msm_sdcc.1", OFF),

	CLK_DUMMY("core_clk",	SDC2_CLK,	"msm_sdcc.2", OFF),