diff options
Diffstat (limited to 'target/linux')
4 files changed, 158 insertions, 0 deletions
| diff --git a/target/linux/ar71xx/patches-3.2/520-MIPS-ath79-enable-UART-function.patch b/target/linux/ar71xx/patches-3.2/520-MIPS-ath79-enable-UART-function.patch new file mode 100644 index 000000000..1cb407f83 --- /dev/null +++ b/target/linux/ar71xx/patches-3.2/520-MIPS-ath79-enable-UART-function.patch @@ -0,0 +1,18 @@ +--- a/arch/mips/ath79/dev-common.c ++++ b/arch/mips/ath79/dev-common.c +@@ -87,6 +87,15 @@ void __init ath79_register_uart(void) + 	if (IS_ERR(clk)) + 		panic("unable to get UART clock, err=%ld", PTR_ERR(clk)); +  ++	if (soc_is_ar71xx()) ++		ath79_gpio_function_enable(AR71XX_GPIO_FUNC_UART_EN); ++	else if (soc_is_ar724x()) ++		ath79_gpio_function_enable(AR724X_GPIO_FUNC_UART_EN); ++	else if (soc_is_ar913x()) ++		ath79_gpio_function_enable(AR913X_GPIO_FUNC_UART_EN); ++	else if (soc_is_ar933x()) ++		ath79_gpio_function_enable(AR933X_GPIO_FUNC_UART_EN); ++ + 	if (soc_is_ar71xx() || + 	    soc_is_ar724x() || + 	    soc_is_ar913x() || diff --git a/target/linux/ar71xx/patches-3.2/521-MIPS-ath79-enable-UART-for-early_serial.patch b/target/linux/ar71xx/patches-3.2/521-MIPS-ath79-enable-UART-for-early_serial.patch new file mode 100644 index 000000000..b96ea3ae5 --- /dev/null +++ b/target/linux/ar71xx/patches-3.2/521-MIPS-ath79-enable-UART-for-early_serial.patch @@ -0,0 +1,61 @@ +--- a/arch/mips/ath79/early_printk.c ++++ b/arch/mips/ath79/early_printk.c +@@ -56,6 +56,46 @@ static void prom_putchar_dummy(unsigned + 	/* nothing to do */ + } +  ++static void prom_enable_uart(u32 id) ++{ ++	void __iomem *gpio_base; ++	u32 uart_en; ++	u32 t; ++ ++	switch (id) { ++	case REV_ID_MAJOR_AR71XX: ++		uart_en = AR71XX_GPIO_FUNC_UART_EN; ++		break; ++ ++	case REV_ID_MAJOR_AR7240: ++	case REV_ID_MAJOR_AR7241: ++	case REV_ID_MAJOR_AR7242: ++		uart_en = AR724X_GPIO_FUNC_UART_EN; ++		break; ++ ++	case REV_ID_MAJOR_AR913X: ++		uart_en = AR913X_GPIO_FUNC_UART_EN; ++		break; ++ ++	case REV_ID_MAJOR_AR9330: ++	case REV_ID_MAJOR_AR9331: ++		uart_en = AR933X_GPIO_FUNC_UART_EN; ++		break; ++ ++	case REV_ID_MAJOR_AR9341: ++	case REV_ID_MAJOR_AR9342: ++	case REV_ID_MAJOR_AR9344: ++		/* TODO */ ++	default: ++		return; ++	} ++ ++	gpio_base = (void __iomem *)(KSEG1ADDR(AR71XX_GPIO_BASE)); ++	t = __raw_readl(gpio_base + AR71XX_GPIO_REG_FUNC); ++	t |= uart_en; ++	__raw_writel(t, gpio_base + AR71XX_GPIO_REG_FUNC); ++} ++ + static void prom_putchar_init(void) + { + 	void __iomem *base; +@@ -84,8 +124,10 @@ static void prom_putchar_init(void) +  + 	default: + 		_prom_putchar = prom_putchar_dummy; +-		break; ++		return; + 	} ++ ++	prom_enable_uart(id); + } +  + void prom_putchar(unsigned char ch) diff --git a/target/linux/ar71xx/patches-3.3/520-MIPS-ath79-enable-UART-function.patch b/target/linux/ar71xx/patches-3.3/520-MIPS-ath79-enable-UART-function.patch new file mode 100644 index 000000000..1cb407f83 --- /dev/null +++ b/target/linux/ar71xx/patches-3.3/520-MIPS-ath79-enable-UART-function.patch @@ -0,0 +1,18 @@ +--- a/arch/mips/ath79/dev-common.c ++++ b/arch/mips/ath79/dev-common.c +@@ -87,6 +87,15 @@ void __init ath79_register_uart(void) + 	if (IS_ERR(clk)) + 		panic("unable to get UART clock, err=%ld", PTR_ERR(clk)); +  ++	if (soc_is_ar71xx()) ++		ath79_gpio_function_enable(AR71XX_GPIO_FUNC_UART_EN); ++	else if (soc_is_ar724x()) ++		ath79_gpio_function_enable(AR724X_GPIO_FUNC_UART_EN); ++	else if (soc_is_ar913x()) ++		ath79_gpio_function_enable(AR913X_GPIO_FUNC_UART_EN); ++	else if (soc_is_ar933x()) ++		ath79_gpio_function_enable(AR933X_GPIO_FUNC_UART_EN); ++ + 	if (soc_is_ar71xx() || + 	    soc_is_ar724x() || + 	    soc_is_ar913x() || diff --git a/target/linux/ar71xx/patches-3.3/521-MIPS-ath79-enable-UART-for-early_serial.patch b/target/linux/ar71xx/patches-3.3/521-MIPS-ath79-enable-UART-for-early_serial.patch new file mode 100644 index 000000000..b96ea3ae5 --- /dev/null +++ b/target/linux/ar71xx/patches-3.3/521-MIPS-ath79-enable-UART-for-early_serial.patch @@ -0,0 +1,61 @@ +--- a/arch/mips/ath79/early_printk.c ++++ b/arch/mips/ath79/early_printk.c +@@ -56,6 +56,46 @@ static void prom_putchar_dummy(unsigned + 	/* nothing to do */ + } +  ++static void prom_enable_uart(u32 id) ++{ ++	void __iomem *gpio_base; ++	u32 uart_en; ++	u32 t; ++ ++	switch (id) { ++	case REV_ID_MAJOR_AR71XX: ++		uart_en = AR71XX_GPIO_FUNC_UART_EN; ++		break; ++ ++	case REV_ID_MAJOR_AR7240: ++	case REV_ID_MAJOR_AR7241: ++	case REV_ID_MAJOR_AR7242: ++		uart_en = AR724X_GPIO_FUNC_UART_EN; ++		break; ++ ++	case REV_ID_MAJOR_AR913X: ++		uart_en = AR913X_GPIO_FUNC_UART_EN; ++		break; ++ ++	case REV_ID_MAJOR_AR9330: ++	case REV_ID_MAJOR_AR9331: ++		uart_en = AR933X_GPIO_FUNC_UART_EN; ++		break; ++ ++	case REV_ID_MAJOR_AR9341: ++	case REV_ID_MAJOR_AR9342: ++	case REV_ID_MAJOR_AR9344: ++		/* TODO */ ++	default: ++		return; ++	} ++ ++	gpio_base = (void __iomem *)(KSEG1ADDR(AR71XX_GPIO_BASE)); ++	t = __raw_readl(gpio_base + AR71XX_GPIO_REG_FUNC); ++	t |= uart_en; ++	__raw_writel(t, gpio_base + AR71XX_GPIO_REG_FUNC); ++} ++ + static void prom_putchar_init(void) + { + 	void __iomem *base; +@@ -84,8 +124,10 @@ static void prom_putchar_init(void) +  + 	default: + 		_prom_putchar = prom_putchar_dummy; +-		break; ++		return; + 	} ++ ++	prom_enable_uart(id); + } +  + void prom_putchar(unsigned char ch) | 
