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

Commit 8838245d authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle
Browse files

MIPS: JZ4740: use Ingenic SoC UART driver 



Remove the serial support from arch/mips/jz4740 & make use of the new
Ingenic SoC UART driver. This is done for both regular & early console
output.

Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: Kumar Gala <galak@codeaurora.org>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: devicetree@vger.kernel.org
Cc: linux-mips@linux-mips.org
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: linux-kernel@vger.kernel.org
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: Apelete Seketeli <apelete@seketeli.net>
Cc: Alexandre Courbot <gnurou@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/10160/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 0cf985f4

arch/mips/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -297,7 +297,6 @@ config MACH_INGENIC 
	select DMA_NONCOHERENT

	select IRQ_MIPS_CPU

	select ARCH_REQUIRE_GPIOLIB

	select SYS_HAS_EARLY_PRINTK

	select COMMON_CLK

	select GENERIC_IRQ_CHIP

	select BUILTIN_DTB

arch/mips/boot/dts/ingenic/jz4740.dtsi

+22 −0
Original line number Diff line number Diff line
@@ -43,4 +43,26 @@ 


		#clock-cells = <1>;

	};



	uart0: serial@10030000 {

		compatible = "ingenic,jz4740-uart";

		reg = <0x10030000 0x100>;



		interrupt-parent = <&intc>;

		interrupts = <9>;



		clocks = <&ext>, <&cgu JZ4740_CLK_UART0>;

		clock-names = "baud", "module";

	};



	uart1: serial@10031000 {

		compatible = "ingenic,jz4740-uart";

		reg = <0x10031000 0x100>;



		interrupt-parent = <&intc>;

		interrupts = <8>;



		clocks = <&ext>, <&cgu JZ4740_CLK_UART1>;

		clock-names = "baud", "module";

	};

};

arch/mips/boot/dts/ingenic/qi_lb60.dts

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,10 @@ 


/ {

	compatible = "qi,lb60", "ingenic,jz4740";



	chosen {

		stdout-path = &uart0;

	};

};



&ext {

arch/mips/configs/qi_lb60_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ CONFIG_SERIAL_8250_CONSOLE=y 
# CONFIG_SERIAL_8250_DMA is not set

CONFIG_SERIAL_8250_NR_UARTS=2

CONFIG_SERIAL_8250_RUNTIME_UARTS=2

CONFIG_SERIAL_8250_INGENIC=y

# CONFIG_HW_RANDOM is not set

CONFIG_SPI=y

CONFIG_SPI_GPIO=y

arch/mips/include/asm/mach-jz4740/platform.h

+0 −2
Original line number Diff line number Diff line
@@ -35,6 +35,4 @@ extern struct platform_device jz4740_wdt_device; 
extern struct platform_device jz4740_pwm_device;

extern struct platform_device jz4740_dma_device;



void jz4740_serial_device_register(void);



#endif