shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 04:48:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2023-04-14 22:29:36 +02:00
parent 718acce6f0 6154a79fdc
commit 7e8298565d
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/mt2701.dtsi
View File

@@ -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>;

6
arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
View File

@@ -322,6 +322,12 @@
vqmmc-supply = <&reg_3p3v>;
};
&mt6323keys {
home {
status = "disabled";
};
};
&mt6323_leds {
status = "okay";