diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-02-13 09:26:04 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-02-13 09:26:04 +0100 |
| commit | 30139163b75970fcd58df6b6b987883e36571046 (patch) | |
| tree | 00bd354cefa617f8474cc73994b1a72c11e770a0 /include | |
| parent | bb1a6a2fd3cc41be6db1a1362f311456019317b1 (diff) | |
| parent | 19df384cec181be4407f82377ffbb3059b1ed748 (diff) | |
| download | barebox-30139163b75970fcd58df6b6b987883e36571046.tar.gz barebox-30139163b75970fcd58df6b6b987883e36571046.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/clk.h | 5 | ||||
| -rw-r--r-- | include/mci.h | 1 | ||||
| -rw-r--r-- | include/mfd/pfuze.h | 6 | ||||
| -rw-r--r-- | include/serial/imx-uart.h | 5 | ||||
| -rw-r--r-- | include/usb/chipidea-imx.h | 4 |
5 files changed, 19 insertions, 2 deletions
diff --git a/include/linux/clk.h b/include/linux/clk.h index 8cb9731f12..7dd52388c5 100644 --- a/include/linux/clk.h +++ b/include/linux/clk.h @@ -198,6 +198,8 @@ static inline int clk_set_rate(struct clk *clk, unsigned long rate) #ifdef CONFIG_COMMON_CLK #define CLK_SET_RATE_PARENT (1 << 0) /* propagate rate change up one level */ +/* parents need enable during gate/ungate, set rate and re-parent */ +#define CLK_OPS_PARENT_ENABLE (1 << 12) #define CLK_GATE_INVERTED (1 << 0) #define CLK_GATE_HIWORD_MASK (1 << 1) @@ -294,6 +296,9 @@ struct clk *clk_gate(const char *name, const char *parent, void __iomem *reg, u8 shift, unsigned flags, u8 clk_gate_flags); struct clk *clk_gate_inverted(const char *name, const char *parent, void __iomem *reg, u8 shift, unsigned flags); +struct clk *clk_gate_shared(const char *name, const char *parent, const char *shared, + unsigned flags); + int clk_is_enabled(struct clk *clk); int clk_is_enabled_always(struct clk *clk); diff --git a/include/mci.h b/include/mci.h index 0370547b0f..cc4712cfad 100644 --- a/include/mci.h +++ b/include/mci.h @@ -433,6 +433,7 @@ struct mci_part { uint64_t size; /* partition size (in bytes) */ unsigned int part_cfg; /* partition type */ char *name; + int idx; unsigned int area_type; #define MMC_BLK_DATA_AREA_MAIN (1<<0) #define MMC_BLK_DATA_AREA_BOOT (1<<1) diff --git a/include/mfd/pfuze.h b/include/mfd/pfuze.h new file mode 100644 index 0000000000..6045ceec0a --- /dev/null +++ b/include/mfd/pfuze.h @@ -0,0 +1,6 @@ +#ifndef __INCLUDE_PFUZE_H +#define __INCLUDE_PFUZE_H + +int pfuze_register_init_callback(void(*callback)(struct regmap *map)); + +#endif /* __INCLUDE_PFUZE_H */ diff --git a/include/serial/imx-uart.h b/include/serial/imx-uart.h index b40044ea4b..9cab32f359 100644 --- a/include/serial/imx-uart.h +++ b/include/serial/imx-uart.h @@ -175,6 +175,11 @@ static inline void imx6_uart_setup(void __iomem *uartbase) imx_uart_setup(uartbase, 80000000); } +static inline void imx7_uart_setup(void __iomem *uartbase) +{ + imx_uart_setup(uartbase, 24000000); +} + static inline void imx_uart_putc(void *base, int c) { if (!(readl(base + UCR1) & UCR1_UARTEN)) diff --git a/include/usb/chipidea-imx.h b/include/usb/chipidea-imx.h index 64f086af6c..640ae06944 100644 --- a/include/usb/chipidea-imx.h +++ b/include/usb/chipidea-imx.h @@ -48,7 +48,7 @@ struct imxusb_platformdata { enum imx_usb_mode mode; }; -int imx_usbmisc_port_init(int port, unsigned flags); -int imx_usbmisc_port_post_init(int port, unsigned flags); +int imx_usbmisc_port_init(struct device_d *dev, int port, unsigned flags); +int imx_usbmisc_port_post_init(struct device_d *dev, int port, unsigned flags); #endif /* __USB_CHIPIDEA_IMX_H */ |