Unverified Commit 7e829856 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v6.3-next-dts32' of... 

Merge tag 'v6.3-next-dts32' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into soc/dt

mt7623:
Disable not exising home key

mt2701:
change node name to match DT bindings

* tag 'v6.3-next-dts32' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  arm: dts: mt7623: disable home key on Bananapi BPI-R2
  arm: dts: mediatek: Fix existing NAND controller node name

Link: https://lore.kernel.org/r/c3b17357-e08d-da7e-def0-a7f9e0b95cb7@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 718acce6 6154a79f

arch/arm/boot/dts/mt2701.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ 
		mediatek,apmixedsys = <&apmixedsys>;

	};



	nandc: nfi@1100d000 {

	nandc: nand-controller@1100d000 {

		compatible = "mediatek,mt2701-nfc";

		reg = <0 0x1100d000 0 0x1000>;

		interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_LOW>;

arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts

+6 −0
Original line number Diff line number Diff line
@@ -322,6 +322,12 @@ 
	vqmmc-supply = <&reg_3p3v>;

};



&mt6323keys {

	home {

		status = "disabled";

	};

};



&mt6323_leds {

	status = "okay";