Commit c7f26a0c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a6ff4631 f7d5f565

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -11119,7 +11119,7 @@ M: Thomas Bogendoerfer <tsbogend@alpha.franken.de> 
L:	linux-mips@vger.kernel.org

W:	http://www.linux-mips.org/

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

F:	Documentation/devicetree/bindings/mips/

F:	Documentation/mips/

arch/mips/boot/dts/ingenic/ci20.dts

+28 −16
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
#include "jz4780.dtsi"

#include <dt-bindings/clock/ingenic,tcu.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";
@@ -163,63 +165,71 @@ 


		regulators {

			vddcore: SUDCDC1 {

				regulator-name = "VDDCORE";

				regulator-name = "DCDC_REG1";

				regulator-min-microvolt = <1100000>;

				regulator-max-microvolt = <1100000>;

				regulator-always-on;

			};

			vddmem: SUDCDC2 {

				regulator-name = "VDDMEM";

				regulator-name = "DCDC_REG2";

				regulator-min-microvolt = <1500000>;

				regulator-max-microvolt = <1500000>;

				regulator-always-on;

			};

			vcc_33: SUDCDC3 {

				regulator-name = "VCC33";

				regulator-name = "DCDC_REG3";

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-always-on;

			};

			vcc_50: SUDCDC4 {

				regulator-name = "VCC50";

				regulator-name = "SUDCDC_REG4";

				regulator-min-microvolt = <5000000>;

				regulator-max-microvolt = <5000000>;

				regulator-always-on;

			};

			vcc_25: LDO_REG5 {

				regulator-name = "VCC25";

				regulator-name = "LDO_REG5";

				regulator-min-microvolt = <2500000>;

				regulator-max-microvolt = <2500000>;

				regulator-always-on;

			};

			wifi_io: LDO_REG6 {

				regulator-name = "WIFIIO";

				regulator-name = "LDO_REG6";

				regulator-min-microvolt = <2500000>;

				regulator-max-microvolt = <2500000>;

				regulator-always-on;

			};

			vcc_28: LDO_REG7 {

				regulator-name = "VCC28";

				regulator-name = "LDO_REG7";

				regulator-min-microvolt = <2800000>;

				regulator-max-microvolt = <2800000>;

				regulator-always-on;

			};

			vcc_15: LDO_REG8 {

				regulator-name = "VCC15";

				regulator-name = "LDO_REG8";

				regulator-min-microvolt = <1500000>;

				regulator-max-microvolt = <1500000>;

				regulator-always-on;

			};

			vcc_18: LDO_REG9 {

				regulator-name = "VCC18";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

			vrtc_18: LDO_REG9 {

				regulator-name = "LDO_REG9";

				/* Despite the datasheet stating 3.3V

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

			};

			vcc_11: LDO_REG10 {

				regulator-name = "VCC11";

				regulator-min-microvolt = <1100000>;

				regulator-max-microvolt = <1100000>;

				regulator-name = "LDO_REG10";

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <1200000>;

				regulator-always-on;

			};

		};
@@ -261,7 +271,9 @@ 
		rtc@51 {

			compatible = "nxp,pcf8563";

			reg = <0x51>;

			interrupts = <110>;



			interrupt-parent = <&gpf>;

			interrupts = <30 IRQ_TYPE_LEVEL_LOW>;

		};

};

arch/mips/kernel/setup.c

+2 −1
Original line number Diff line number Diff line
@@ -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

	 * 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);

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE