diff options
| author | Ke Qinghua <qinghua.ke@freescale.com> | 2014-07-01 11:28:51 +0800 |
|---|---|---|
| committer | Ke Qinghua <qinghua.ke@freescale.com> | 2014-07-01 11:47:26 +0800 |
| commit | d5800fcb9c0a07366c920414326ecb61d362b7b1 (patch) | |
| tree | 686d7f7c5291fae49b48dbc95355e06d0c42d945 /include | |
| parent | ffa6a894db981abaed4e023cb2b198cc22e68f0f (diff) | |
| parent | 58ad81506e01e6a9625bc096595113f1f6bbe521 (diff) | |
Merge remote-tracking branch 'remotes/fsl-linux-sdk/imx_3.10.31_1.1.0_beta' into imx_3.10.y_android
Conflicts:
arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
arch/arm/boot/dts/imx6qdl-sabresd.dtsi
drivers/hwmon/Makefile
drivers/hwmon/mma8x5x.c
drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c
drivers/usb/chipidea/otg_fsm.c
drivers/usb/chipidea/udc.c
drivers/usb/gadget/udc-core.c
drivers/usb/phy/Kconfig
drivers/usb/phy/Makefile
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/imx6sx-clock.h | 3 | ||||
| -rw-r--r-- | include/linux/clk-provider.h | 6 | ||||
| -rw-r--r-- | include/linux/usb/gadget.h | 1 | ||||
| -rw-r--r-- | include/linux/usb/otg-fsm.h | 12 |
4 files changed, 20 insertions, 2 deletions
diff --git a/include/dt-bindings/clock/imx6sx-clock.h b/include/dt-bindings/clock/imx6sx-clock.h index 421d8bb76f2f..0e3710cdd5f6 100644 --- a/include/dt-bindings/clock/imx6sx-clock.h +++ b/include/dt-bindings/clock/imx6sx-clock.h @@ -251,6 +251,7 @@ #define IMX6SX_CLK_SAI2_IPG 238 #define IMX6SX_CLK_ESAI_IPG 239 #define IMX6SX_CLK_ESAI_MEM 240 -#define IMX6SX_CLK_CLK_END 241 +#define IMX6SX_CLK_OCRAM_ALT_SEL 241 +#define IMX6SX_CLK_CLK_END 242 #endif /* __DT_BINDINGS_CLOCK_IMX6SX_H */ diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 4e9f36a15033..0c71babde4a7 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -28,6 +28,12 @@ #define CLK_IS_BASIC BIT(5) /* Basic clk, can't do a to_clk_foo() */ #define CLK_GET_RATE_NOCACHE BIT(6) /* do not use the cached clk rate */ #define CLK_SET_RATE_NO_REPARENT BIT(7) /* don't re-parent on rate change */ +/* + * Basic mux clk, can't switch parent while there is another basic mux clk + * being its child. Otherwise, a glitch might be propagated to downstream + * clocks through this child mux. + */ +#define CLK_IS_BASIC_MUX BIT(8) struct clk_hw; diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h index 08c6877f7a2b..28e99a181b35 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h @@ -536,6 +536,7 @@ struct usb_gadget { unsigned b_hnp_enable:1; unsigned a_hnp_support:1; unsigned a_alt_hnp_support:1; + unsigned host_request_flag:1; const char *name; struct device dev; unsigned out_epnum; diff --git a/include/linux/usb/otg-fsm.h b/include/linux/usb/otg-fsm.h index b6ba1bfb86f2..d4bf33b1ad6f 100644 --- a/include/linux/usb/otg-fsm.h +++ b/include/linux/usb/otg-fsm.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007,2008 Freescale Semiconductor, Inc. +/* Copyright (C) 2007-2014 Freescale Semiconductor, Inc. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -40,6 +40,14 @@ #define PROTO_HOST (1) #define PROTO_GADGET (2) +#define OTG_STS_SELECTOR 0xF000 /* OTG status selector, according to + * OTG and EH 2.0 Charpter 6.2.3 + * Table:6-4 + */ +#define HOST_REQUEST_FLAG 1 /* Host request flag, according to + * OTG and EH 2.0 Charpter 6.2.3 + * Table:6-5 + */ enum otg_fsm_timer { /* Standard OTG timers */ A_WAIT_VRISE, @@ -53,6 +61,7 @@ enum otg_fsm_timer { B_SE0_SRP, B_SRP_FAIL, A_WAIT_ENUM, + HNP_POLLING, NUM_OTG_FSM_TIMERS, }; @@ -239,6 +248,7 @@ static inline int otg_start_gadget(struct otg_fsm *fsm, int on) return fsm->ops->start_gadget(fsm, on); } +int otg_hnp_polling(struct otg_fsm *fsm); int otg_statemachine(struct otg_fsm *fsm); #endif /* __LINUX_USB_OTG_FSM_H */ |