Commit bce6824c authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/core' into x86/build, to avoid conflicts 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 494b5168 c0554d2d

Documentation/fb/uvesafb.txt

+3 −2
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ than x86. Check the v86d documentation for a list of currently supported 
arches.



v86d source code can be downloaded from the following website:

  http://dev.gentoo.org/~spock/projects/uvesafb



  https://github.com/mjanusz/v86d



Please refer to the v86d documentation for detailed configuration and

installation instructions.
@@ -177,7 +178,7 @@ from the Video BIOS if you set pixclock to 0 in fb_var_screeninfo. 


--

 Michal Januszewski <spock@gentoo.org>

 Last updated: 2009-03-30

 Last updated: 2017-10-10



 Documentation of the uvesafb options is loosely based on vesafb.txt.

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -1251,7 +1251,7 @@ N: meson 


ARM/Annapurna Labs ALPINE ARCHITECTURE

M:	Tsahee Zidenberg <tsahee@annapurnalabs.com>

M:	Antoine Tenart <antoine.tenart@free-electrons.com>

M:	Antoine Tenart <antoine.tenart@bootlin.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-alpine/
@@ -15395,7 +15395,7 @@ S: Maintained 
UVESAFB DRIVER

M:	Michal Januszewski <spock@gentoo.org>

L:	linux-fbdev@vger.kernel.org

W:	http://dev.gentoo.org/~spock/projects/uvesafb/

W:	https://github.com/mjanusz/v86d

S:	Maintained

F:	Documentation/fb/uvesafb.txt

F:	drivers/video/fbdev/uvesafb.*

arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include "sama5d2-pinfunc.h"

#include <dt-bindings/mfd/atmel-flexcom.h>

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/pinctrl/at91.h>



/ {

	model = "Atmel SAMA5D2 PTC EK";
@@ -299,6 +300,7 @@ 
							 <PIN_PA30__NWE_NANDWE>,

							 <PIN_PB2__NRD_NANDOE>;

						bias-pull-up;

						atmel,drive-strength = <ATMEL_PIO_DRVSTR_ME>;

					};



					ale_cle_rdy_cs {

arch/arm/boot/dts/bcm63138.dtsi

+8 −6
Original line number Diff line number Diff line
@@ -106,21 +106,23 @@ 
		global_timer: timer@1e200 {

			compatible = "arm,cortex-a9-global-timer";

			reg = <0x1e200 0x20>;

			interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>;

			clocks = <&axi_clk>;

		};



		local_timer: local-timer@1e600 {

			compatible = "arm,cortex-a9-twd-timer";

			reg = <0x1e600 0x20>;

			interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |

						  IRQ_TYPE_EDGE_RISING)>;

			clocks = <&axi_clk>;

		};



		twd_watchdog: watchdog@1e620 {

			compatible = "arm,cortex-a9-twd-wdt";

			reg = <0x1e620 0x20>;

			interrupts = <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) |

						  IRQ_TYPE_LEVEL_HIGH)>;

		};



		armpll: armpll {
@@ -158,7 +160,7 @@ 
		serial0: serial@600 {

			compatible = "brcm,bcm6345-uart";

			reg = <0x600 0x1b>;

			interrupts = <GIC_SPI 32 0>;

			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&periph_clk>;

			clock-names = "periph";

			status = "disabled";
@@ -167,7 +169,7 @@ 
		serial1: serial@620 {

			compatible = "brcm,bcm6345-uart";

			reg = <0x620 0x1b>;

			interrupts = <GIC_SPI 33 0>;

			interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&periph_clk>;

			clock-names = "periph";

			status = "disabled";
@@ -180,7 +182,7 @@ 
			reg = <0x2000 0x600>, <0xf0 0x10>;

			reg-names = "nand", "nand-int-base";

			status = "disabled";

			interrupts = <GIC_SPI 38 0>;

			interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "nand";

		};

arch/arm/boot/dts/stm32mp157c.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1078,8 +1078,8 @@ 
			interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&rcc SPI6_K>;

			resets = <&rcc SPI6_R>;

			dmas = <&mdma1 34 0x0 0x40008 0x0 0x0 0>,

			       <&mdma1 35 0x0 0x40002 0x0 0x0 0>;

			dmas = <&mdma1 34 0x0 0x40008 0x0 0x0>,

			       <&mdma1 35 0x0 0x40002 0x0 0x0>;

			dma-names = "rx", "tx";

			status = "disabled";

		};