xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'gemini-dts-v5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into arm/dt

Browse Source 
DTS updates for the Gemini platform:

- Fix up some pin config confusion

- Use redboot partition parsing on the SL93512r

- Mount root on mtdblock3 by default

* tag 'gemini-dts-v5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: gemini: Mount root from mtdblock3
  ARM: dts: gemini: Switch to redboot partition parsing
  ARM: dts: gemini: Fix up confused pin settings

Link: https://lore.kernel.org/r/CACRpkdarsQNfXgXMQKfYwOyiqhKY67gKd3ufQ+wexwO3v=LE5w@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2019-08-13 15:43:13 +02:00
parent fbe4a49f6d e8547e12d5
commit 2a2bb58aae
2 changed files with 21 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
arch/arm/boot/dts/gemini-nas4220b.dts
View File

@@ -20,7 +20,7 @@
};
chosen {
bootargs = "console=ttyS0,19200n8";
bootargs = "console=ttyS0,19200n8 root=/dev/mtdblock3 rw rootfstype=squashfs,jffs2 rootwait";
stdout-path = &uart0;
};
@@ -81,37 +81,10 @@
/* 16MB of flash */
reg = <0x30000000 0x01000000>;
partition@0 {
label = "RedBoot";
reg = <0x00000000 0x00020000>;
read-only;
};
partition@20000 {
label = "Kernel";
reg = <0x00020000 0x00300000>;
};
partition@320000 {
label = "Ramdisk";
reg = <0x00320000 0x00600000>;
};
partition@920000 {
label = "Application";
reg = <0x00920000 0x00600000>;
};
partition@f20000 {
label = "VCTL";
reg = <0x00f20000 0x00020000>;
read-only;
};
partition@f40000 {
label = "CurConf";
reg = <0x00f40000 0x000a0000>;
read-only;
};
partition@fe0000 {
label = "FIS directory";
reg = <0x00fe0000 0x00020000>;
read-only;
partitions {
compatible = "redboot-fis";
/* Eraseblock at 0xfe0000 */
fis-index-block = <0x1fc>;
};
};

56
arch/arm/boot/dts/gemini-sl93512r.dts
View File

@@ -24,7 +24,7 @@
};
chosen {
bootargs = "console=ttyS0,19200n8 root=/dev/sda1 rw rootwait";
bootargs = "console=ttyS0,19200n8 root=/dev/mtdblock3 rw rootfstype=squashfs,jffs2 rootwait";
stdout-path = &uart0;
};
@@ -36,8 +36,8 @@
wakeup-source;
linux,code = <KEY_WPS_BUTTON>;
label = "WPS";
/* Conflict with NAND flash */
gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
/* Conflicts with TVC and extended flash */
gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
};
button-setup {
@@ -143,54 +143,30 @@
/* 16MB of flash */
reg = <0x30000000 0x01000000>;
partition@0 {
label = "BOOT";
reg = <0x00000000 0x00020000>;
read-only;
};
partition@120000 {
label = "Kern";
reg = <0x00020000 0x00300000>;
};
partition@320000 {
label = "Ramdisk";
reg = <0x00320000 0x00600000>;
};
partition@920000 {
label = "Application";
reg = <0x00920000 0x00600000>;
};
partition@f20000 {
label = "VCTL";
reg = <0x00f20000 0x00020000>;
read-only;
};
partition@f40000 {
label = "CurConf";
reg = <0x00f40000 0x000a0000>;
read-only;
};
partition@fe0000 {
label = "FIS directory";
reg = <0x00fe0000 0x00020000>;
read-only;
partitions {
compatible = "redboot-fis";
/* Eraseblock at 0xfe0000 */
fis-index-block = <0x1fc>;
};
};
syscon: syscon@40000000 {
pinctrl {
/*
* gpio0egrp cover line 16 used by HD LED
* gpio0fgrp cover line 17, 18 used by wireless LED and reset button
* gpio0hgrp cover line 21, 22 used by MDIO for Marvell PHY
* gpio0kgrp cover line 31 used by USB LED
* gpio0agrp cover line 0, used by WPS button
* gpio0fgrp cover line 16 used by HD LED
* gpio0ggrp cover line 17, 18 used by wireless LAN LED and
* reset button OR USB ID select on 17 and USB VBUS select
* on 18. (Confusing.)
* gpio0igrp cover line 21, 22 used by MDIO for Marvell PHY
*/
gpio0_default_pins: pinctrl-gpio0 {
mux {
function = "gpio0";
groups = "gpio0egrp",
groups = "gpio0agrp",
"gpio0fgrp",
"gpio0hgrp";
"gpio0ggrp",
"gpio0igrp";
};
};
/*