318e19ba67
adds v4.14 patches for testing but leaves v4.9 as default for now. Signed-off-by: John Crispin <john@phrozen.org>
39 lines
984 B
Diff
39 lines
984 B
Diff
--- a/arch/mips/ath79/common.h
|
|
+++ b/arch/mips/ath79/common.h
|
|
@@ -27,6 +27,7 @@ void ath79_ddr_ctrl_init(void);
|
|
void ath79_gpio_function_enable(u32 mask);
|
|
void ath79_gpio_function_disable(u32 mask);
|
|
void ath79_gpio_function_setup(u32 set, u32 clear);
|
|
+void ath79_gpio_output_select(unsigned gpio, u8 val);
|
|
void ath79_gpio_init(void);
|
|
|
|
#endif /* __ATH79_COMMON_H */
|
|
--- a/arch/mips/ath79/gpio.c
|
|
+++ b/arch/mips/ath79/gpio.c
|
|
@@ -57,3 +57,26 @@ void ath79_gpio_function_disable(u32 mas
|
|
{
|
|
ath79_gpio_function_setup(0, mask);
|
|
}
|
|
+
|
|
+void __init ath79_gpio_output_select(unsigned gpio, u8 val)
|
|
+{
|
|
+ void __iomem *base = ath79_gpio_base;
|
|
+ unsigned int reg;
|
|
+ u32 t, s;
|
|
+
|
|
+ BUG_ON(!soc_is_ar934x());
|
|
+
|
|
+ if (gpio >= AR934X_GPIO_COUNT)
|
|
+ return;
|
|
+
|
|
+ reg = AR934X_GPIO_REG_OUT_FUNC0 + 4 * (gpio / 4);
|
|
+ s = 8 * (gpio % 4);
|
|
+
|
|
+ t = __raw_readl(base + reg);
|
|
+ t &= ~(0xff << s);
|
|
+ t |= val << s;
|
|
+ __raw_writel(t, base + reg);
|
|
+
|
|
+ /* flush write */
|
|
+ (void) __raw_readl(base + reg);
|
|
+}
|