- DT fixes for CI20
 
 - Fix command line handling
 
 - Correct patchwork URL
 -----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCAA4FiEEbt46xwy6kEcDOXoUeZbBVTGwZHAFAl5ottkaHHRzYm9nZW5k
 QGFscGhhLmZyYW5rZW4uZGUACgkQeZbBVTGwZHCKrQ/9FrLgVTfHg5er781ajjRX
 R7LDghNyFPLur+lBiOR1/+cAtv8PK3zZu5JoSsy4CHhx6OUFKjeVAkjT/3KQNj4W
 hpL28kDRZrN0j66+mtNqiNcudUkF13HlR6p17I9iyZq+odXWUJDmGNhi7jr43KUf
 /bqmsfwZVfpdDamojR9n3aYi8wTOQEeu5cR6gO1145eVoUCaajcCcC7dlwhA7etn
 LsRim9xe31/XKa/YRkM4ql93QXObaJzAtMTAaeD6cPHnbwGtDXduXCDPVSMQNPzQ
 QQ6mXkaEwPo+uwcQp2E+mnFZ8qus37X6XhcThFy3rWplb8VVKiRs7jYR9Nq3J+4u
 pyCfSH21RdO6uLSquDsCzfzillfAygyRj4mdvFt4Fgm59EBXHQHV6p4weUiplSJq
 3+WOkb0atcXeSdK/eRLMLgzT5LmlXRm3jnHMAsZUQPpMRj69ZOm/KwpWayVwpJ70
 AqGMPhbooN+ysIrilq3un3UkApeVQyus89yltTzZH9gRD2PeGe15+o3x9g2AjAfA
 zlkLEj7o9YT0Uyc1O7pya87m9G9AoWiyZLUyO7gz0iFBgjvi7gzfZMJPtEs30JVi
 3sF2//oHTnFZF6JZNwx9938oE8zQS4d7mPf4T5SmPz0b9GZwEUiuPSQ7Gv6AYWcY
 ERC6aGpB1r/JZZFYXM3scJg=
 =ZeM1
 -----END PGP SIGNATURE-----

Merge tag 'mips_fixes_5.6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

Pull MIPS fixes from Thomas Bogendoerfer:
 "A few MIPS fixes:

   - DT fixes for CI20

   - Fix command line handling

   - Correct patchwork URL"

* tag 'mips_fixes_5.6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MAINTAINERS: Correct MIPS patchwork URL
  MIPS: DTS: CI20: fix interrupt for pcf8563 RTC
  MIPS: DTS: CI20: fix PMU definitions for ACT8600
  MIPS: Fix CONFIG_MIPS_CMDLINE_DTB_EXTEND handling
This commit is contained in:
Linus Torvalds 2020-03-11 09:49:47 -07:00
Родитель a6ff4631a6 f7d5f5655e
Коммит c7f26a0ce6
3 изменённых файлов: 31 добавлений и 18 удалений

Просмотреть файл

@ -11119,7 +11119,7 @@ M: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
L: linux-mips@vger.kernel.org L: linux-mips@vger.kernel.org
W: http://www.linux-mips.org/ W: http://www.linux-mips.org/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git
Q: http://patchwork.linux-mips.org/project/linux-mips/list/ Q: https://patchwork.kernel.org/project/linux-mips/list/
S: Maintained S: Maintained
F: Documentation/devicetree/bindings/mips/ F: Documentation/devicetree/bindings/mips/
F: Documentation/mips/ F: Documentation/mips/

Просмотреть файл

@ -4,6 +4,8 @@
#include "jz4780.dtsi" #include "jz4780.dtsi"
#include <dt-bindings/clock/ingenic,tcu.h> #include <dt-bindings/clock/ingenic,tcu.h>
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/regulator/active-semi,8865-regulator.h>
/ { / {
compatible = "img,ci20", "ingenic,jz4780"; compatible = "img,ci20", "ingenic,jz4780";
@ -163,63 +165,71 @@
regulators { regulators {
vddcore: SUDCDC1 { vddcore: SUDCDC1 {
regulator-name = "VDDCORE"; regulator-name = "DCDC_REG1";
regulator-min-microvolt = <1100000>; regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>; regulator-max-microvolt = <1100000>;
regulator-always-on; regulator-always-on;
}; };
vddmem: SUDCDC2 { vddmem: SUDCDC2 {
regulator-name = "VDDMEM"; regulator-name = "DCDC_REG2";
regulator-min-microvolt = <1500000>; regulator-min-microvolt = <1500000>;
regulator-max-microvolt = <1500000>; regulator-max-microvolt = <1500000>;
regulator-always-on; regulator-always-on;
}; };
vcc_33: SUDCDC3 { vcc_33: SUDCDC3 {
regulator-name = "VCC33"; regulator-name = "DCDC_REG3";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-always-on; regulator-always-on;
}; };
vcc_50: SUDCDC4 { vcc_50: SUDCDC4 {
regulator-name = "VCC50"; regulator-name = "SUDCDC_REG4";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-always-on; regulator-always-on;
}; };
vcc_25: LDO_REG5 { vcc_25: LDO_REG5 {
regulator-name = "VCC25"; regulator-name = "LDO_REG5";
regulator-min-microvolt = <2500000>; regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <2500000>; regulator-max-microvolt = <2500000>;
regulator-always-on; regulator-always-on;
}; };
wifi_io: LDO_REG6 { wifi_io: LDO_REG6 {
regulator-name = "WIFIIO"; regulator-name = "LDO_REG6";
regulator-min-microvolt = <2500000>; regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <2500000>; regulator-max-microvolt = <2500000>;
regulator-always-on; regulator-always-on;
}; };
vcc_28: LDO_REG7 { vcc_28: LDO_REG7 {
regulator-name = "VCC28"; regulator-name = "LDO_REG7";
regulator-min-microvolt = <2800000>; regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>; regulator-max-microvolt = <2800000>;
regulator-always-on; regulator-always-on;
}; };
vcc_15: LDO_REG8 { vcc_15: LDO_REG8 {
regulator-name = "VCC15"; regulator-name = "LDO_REG8";
regulator-min-microvolt = <1500000>; regulator-min-microvolt = <1500000>;
regulator-max-microvolt = <1500000>; regulator-max-microvolt = <1500000>;
regulator-always-on; regulator-always-on;
}; };
vcc_18: LDO_REG9 { vrtc_18: LDO_REG9 {
regulator-name = "VCC18"; regulator-name = "LDO_REG9";
regulator-min-microvolt = <1800000>; /* Despite the datasheet stating 3.3V
regulator-max-microvolt = <1800000>; * for REG9 and the driver expecting that,
* REG9 outputs 1.8V.
* Likely the CI20 uses a proprietary
* factory programmed chip variant.
* Since this is a simple on/off LDO the
* exact values do not matter.
*/
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on; regulator-always-on;
}; };
vcc_11: LDO_REG10 { vcc_11: LDO_REG10 {
regulator-name = "VCC11"; regulator-name = "LDO_REG10";
regulator-min-microvolt = <1100000>; regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1100000>; regulator-max-microvolt = <1200000>;
regulator-always-on; regulator-always-on;
}; };
}; };
@ -261,7 +271,9 @@
rtc@51 { rtc@51 {
compatible = "nxp,pcf8563"; compatible = "nxp,pcf8563";
reg = <0x51>; reg = <0x51>;
interrupts = <110>;
interrupt-parent = <&gpf>;
interrupts = <30 IRQ_TYPE_LEVEL_LOW>;
}; };
}; };

Просмотреть файл

@ -605,7 +605,8 @@ static void __init bootcmdline_init(char **cmdline_p)
* If we're configured to take boot arguments from DT, look for those * If we're configured to take boot arguments from DT, look for those
* now. * now.
*/ */
if (IS_ENABLED(CONFIG_MIPS_CMDLINE_FROM_DTB)) if (IS_ENABLED(CONFIG_MIPS_CMDLINE_FROM_DTB) ||
IS_ENABLED(CONFIG_MIPS_CMDLINE_DTB_EXTEND))
of_scan_flat_dt(bootcmdline_scan_chosen, &dt_bootargs); of_scan_flat_dt(bootcmdline_scan_chosen, &dt_bootargs);
#endif #endif