Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37937ee7 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-dt64-5.3' of... 

Merge tag 'imx-dt64-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt

i.MX arm64 device tree changes for 5.3:
 - Add i.MX8MQ based Librem5 devkit support.
 - Add SNVS power key support for i.MX8MQ and i.MX8MM.
 - Add GPIO alias for imx8mq and i.MX8QXP.
 - A series from Daniel Baluta to add SAI devices and enable audio
   support for imx8mm-evk board.
 - Add DDR performance monitor unit support for i.MX8QXP.
 - Add irqsteer interrupt controller device for i.MX8MQ SoC.
 - Add CPU speed grading and all OPPs for i.MX8MM and i.MX8MQ.
 - Add OCOTP device node for i.MX8QXP.
 - Various device addition for LS1028A: SATA, qDMA, USB, Mali DP500 and
   temperature sensor.
 - Random minor coding style improvements.

* tag 'imx-dt64-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

: (32 commits)
  arm64: dts: librem5: enable the SNVS power key
  arm64: dts: librem5: Limit the USB to 5V
  arm64: dts: imx8qxp: added ddr performance monitor nodes
  arm64: dts: imx8qxp: sort LSIO subsystem devices
  arm64: dts: imx8qxp: sort alias alphabetically
  arm64: dts: imx8qxp: Add lsio_mu13 node
  arm64: dts: imx8mm-evk: Enable audio codec wm8524
  arm64: dts: fsl: librem5: Add a device tree for the Librem5 devkit
  arm64: dts: fsl: ls1028a: Add qDMA node
  arm64: dts: imx8mm: Enable SNVS power key according to board design
  arm64: dts: imx8mq-evk: Enable SNVS power key
  arm64: dts: ls1028a: add crypto node
  arm64: dts: ls1028a: Add temperature sensor node
  arm64: dts: imx8mm: Move gic node into soc node
  arm64: dts: imx8mm: Move usbphy out of soc node
  arm64: dts: imx8mm: Pass the 'ranges' property
  arm64: dts: imx8mm: Pass a unit name for the 'soc' node
  arm64: dts: fsl: imx8mq: add the snvs power key node
  arm64: dts: ls1028a: fix watchdog device node
  arm64: dts: ls1028a: Enable sata.
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 09253fcc 01407158

arch/arm64/boot/dts/freescale/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-rdb.dtb 


dtb-$(CONFIG_ARCH_MXC) += imx8mm-evk.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mq-evk.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mq-librem5-devkit.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mq-zii-ultra-rmb3.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mq-zii-ultra-zest.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8qxp-mek.dtb

arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts

+20 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
	compatible = "fsl,ls1028a-qds", "fsl,ls1028a";



	aliases {

		crypto = &crypto;

		gpio0 = &gpio1;

		gpio1 = &gpio2;

		gpio2 = &gpio3;
@@ -47,6 +48,15 @@ 
		regulator-always-on;

	};



	sb_3v3: regulator-sb3v3 {

		compatible = "regulator-fixed";

		regulator-name = "3v3_vbus";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-boot-on;

		regulator-always-on;

	};



	sound {

		compatible = "simple-audio-card";

		simple-audio-card,format = "i2s";
@@ -117,6 +127,12 @@ 
			#size-cells = <0>;

			reg = <0x3>;



			temperature-sensor@4c {

				compatible = "nxp,sa56004";

				reg = <0x4c>;

				vcc-supply = <&sb_3v3>;

			};



			rtc@51 {

				compatible = "nxp,pcf2129";

				reg = <0x51>;
@@ -153,3 +169,7 @@ 
&sai1 {

	status = "okay";

};



&sata {

	status = "okay";

};

arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts

+20 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
	compatible = "fsl,ls1028a-rdb", "fsl,ls1028a";



	aliases {

		crypto = &crypto;

		serial0 = &duart0;

		serial1 = &duart1;

	};
@@ -43,6 +44,15 @@ 
		regulator-always-on;

	};



	sb_3v3: regulator-sb3v3 {

		compatible = "regulator-fixed";

		regulator-name = "3v3_vbus";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-boot-on;

		regulator-always-on;

	};



	sound {

		compatible = "simple-audio-card";

		simple-audio-card,format = "i2s";
@@ -115,6 +125,12 @@ 
			#size-cells = <0>;

			reg = <0x3>;



			temperature-sensor@4c {

				compatible = "nxp,sa56004";

				reg = <0x4c>;

				vcc-supply = <&sb_3v3>;

			};



			rtc@51 {

				compatible = "nxp,pcf2129";

				reg = <0x51>;
@@ -151,3 +167,7 @@ 
&sai4 {

	status = "okay";

};



&sata {

	status = "okay";

};

arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi

+129 −7
Original line number Diff line number Diff line
@@ -70,6 +70,27 @@ 
		clock-output-names = "sysclk";

	};



	dpclk: clock-dp {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <27000000>;

		clock-output-names= "dpclk";

	};



	aclk: clock-axi {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <650000000>;

		clock-output-names= "aclk";

	};



	pclk: clock-apb {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <650000000>;

		clock-output-names= "pclk";

	};



	reboot {

		compatible ="syscon-reboot";

		regmap = <&dcfg>;
@@ -285,13 +306,24 @@ 
			#interrupt-cells = <2>;

		};



		wdog0: watchdog@23c0000 {

			compatible = "fsl,ls1028a-wdt", "fsl,imx21-wdt";

			reg = <0x0 0x23c0000 0x0 0x10000>;

			interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&clockgen 4 1>;

			big-endian;

			status = "disabled";

		usb0: usb@3100000 {

			compatible = "fsl,ls1028a-dwc3", "snps,dwc3";

			reg = <0x0 0x3100000 0x0 0x10000>;

			interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;

			dr_mode = "host";

			snps,dis_rxdet_inp3_quirk;

			snps,quirk-frame-length-adjustment = <0x20>;

			snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;

		};



		usb1: usb@3110000 {

			compatible = "fsl,ls1028a-dwc3", "snps,dwc3";

			reg = <0x0 0x3110000 0x0 0x10000>;

			interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;

			dr_mode = "host";

			snps,dis_rxdet_inp3_quirk;

			snps,quirk-frame-length-adjustment = <0x20>;

			snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;

		};



		sata: sata@3200000 {
@@ -356,6 +388,79 @@ 
				     <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>;

		};



		crypto: crypto@8000000 {

			compatible = "fsl,sec-v5.0", "fsl,sec-v4.0";

			fsl,sec-era = <10>;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0x00 0x8000000 0x100000>;

			reg = <0x00 0x8000000 0x0 0x100000>;

			interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;

			dma-coherent;



			sec_jr0: jr@10000 {

				compatible = "fsl,sec-v5.0-job-ring",

					     "fsl,sec-v4.0-job-ring";

				reg	= <0x10000 0x10000>;

				interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;

			};



			sec_jr1: jr@20000 {

				compatible = "fsl,sec-v5.0-job-ring",

					     "fsl,sec-v4.0-job-ring";

				reg	= <0x20000 0x10000>;

				interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>;

			};



			sec_jr2: jr@30000 {

				compatible = "fsl,sec-v5.0-job-ring",

					     "fsl,sec-v4.0-job-ring";

				reg	= <0x30000 0x10000>;

				interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>;

			};



			sec_jr3: jr@40000 {

				compatible = "fsl,sec-v5.0-job-ring",

					     "fsl,sec-v4.0-job-ring";

				reg	= <0x40000 0x10000>;

				interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;

			};

		};



		qdma: dma-controller@8380000 {

			compatible = "fsl,ls1028a-qdma", "fsl,ls1021a-qdma";

			reg = <0x0 0x8380000 0x0 0x1000>, /* Controller regs */

			      <0x0 0x8390000 0x0 0x10000>, /* Status regs */

			      <0x0 0x83a0000 0x0 0x40000>; /* Block regs */

			interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 251 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 252 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 253 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 254 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "qdma-error", "qdma-queue0",

				"qdma-queue1", "qdma-queue2", "qdma-queue3";

			dma-channels = <8>;

			block-number = <1>;

			block-offset = <0x10000>;

			fsl,dma-queues = <2>;

			status-sizes = <64>;

			queue-sizes = <64 64>;

		};



		cluster1_core0_watchdog: watchdog@c000000 {

			compatible = "arm,sp805", "arm,primecell";

			reg = <0x0 0xc000000 0x0 0x1000>;

			clocks = <&clockgen 4 15>, <&clockgen 4 15>;

			clock-names = "apb_pclk", "wdog_clk";

		};



		cluster1_core1_watchdog: watchdog@c010000 {

			compatible = "arm,sp805", "arm,primecell";

			reg = <0x0 0xc010000 0x0 0x1000>;

			clocks = <&clockgen 4 15>, <&clockgen 4 15>;

			clock-names = "apb_pclk", "wdog_clk";

		};



		sai1: audio-controller@f100000 {

			#sound-dai-cells = <0>;

			compatible = "fsl,vf610-sai";
@@ -433,4 +538,21 @@ 
			};

		};

	};



	malidp0: display@f080000 {

		compatible = "arm,mali-dp500";

		reg = <0x0 0xf080000 0x0 0x10000>;

		interrupts = <0 222 IRQ_TYPE_LEVEL_HIGH>,

			     <0 223 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "DE", "SE";

		clocks = <&dpclk>, <&aclk>, <&aclk>, <&pclk>;

		clock-names = "pxlclk", "mclk", "aclk", "pclk";

		arm,malidp-output-port-lines = /bits/ 8 <8 8 8>;



		port {

			dp0_out: endpoint {



			};

		};

	};

};

arch/arm64/boot/dts/freescale/imx8mm-evk.dts

+190 −0
Original line number Diff line number Diff line
@@ -37,6 +37,41 @@ 
		gpio = <&gpio2 19 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	wm8524: audio-codec {

		#sound-dai-cells = <0>;

		compatible = "wlf,wm8524";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_gpio_wlf>;

		wlf,mute-gpios = <&gpio5 21 GPIO_ACTIVE_LOW>;

	};



	sound-wm8524 {

		compatible = "simple-audio-card";

		simple-audio-card,name = "wm8524-audio";

		simple-audio-card,format = "i2s";

		simple-audio-card,frame-master = <&cpudai>;

		simple-audio-card,bitclock-master = <&cpudai>;

		simple-audio-card,widgets =

			"Line", "Left Line Out Jack",

			"Line", "Right Line Out Jack";

		simple-audio-card,routing =

			"Left Line Out Jack", "LINEVOUTL",

			"Right Line Out Jack", "LINEVOUTR";



		cpudai: simple-audio-card,cpu {

			sound-dai = <&sai3>;

		};



		simple-audio-card,codec {

			sound-dai = <&wm8524>;

			clocks = <&clk IMX8MM_CLK_SAI3_ROOT>;

		};

	};

};



&A53_0 {

	cpu-supply = <&buck2_reg>;

};



&fec1 {
@@ -61,6 +96,19 @@ 
	};

};



&sai3 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_sai3>;

	assigned-clocks = <&clk IMX8MM_CLK_SAI3>;

	assigned-clock-parents = <&clk IMX8MM_AUDIO_PLL1_OUT>;

	assigned-clock-rates = <24576000>;

	status = "okay";

};



&snvs_pwrkey {

	status = "okay";

};



&uart2 { /* console */

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_uart2>;
@@ -95,6 +143,120 @@ 
	status = "okay";

};



&i2c1 {

	clock-frequency = <400000>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_i2c1>;

	status = "okay";



	pmic@4b {

		compatible = "rohm,bd71847";

		reg = <0x4b>;

		pinctrl-0 = <&pinctrl_pmic>;

		interrupt-parent = <&gpio1>;

		interrupts = <3 GPIO_ACTIVE_LOW>;

		rohm,reset-snvs-powered;



		regulators {

			buck1_reg: BUCK1 {

				regulator-name = "BUCK1";

				regulator-min-microvolt = <700000>;

				regulator-max-microvolt = <1300000>;

				regulator-boot-on;

				regulator-always-on;

				regulator-ramp-delay = <1250>;

			};



			buck2_reg: BUCK2 {

				regulator-name = "BUCK2";

				regulator-min-microvolt = <700000>;

				regulator-max-microvolt = <1300000>;

				regulator-boot-on;

				regulator-always-on;

				regulator-ramp-delay = <1250>;

				rohm,dvs-run-voltage = <1000000>;

				rohm,dvs-idle-voltage = <900000>;

			};



			buck3_reg: BUCK3 {

				// BUCK5 in datasheet

				regulator-name = "BUCK3";

				regulator-min-microvolt = <700000>;

				regulator-max-microvolt = <1350000>;

				regulator-boot-on;

				regulator-always-on;

			};



			buck4_reg: BUCK4 {

				// BUCK6 in datasheet

				regulator-name = "BUCK4";

				regulator-min-microvolt = <3000000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;

				regulator-always-on;

			};



			buck5_reg: BUCK5 {

				// BUCK7 in datasheet

				regulator-name = "BUCK5";

				regulator-min-microvolt = <1605000>;

				regulator-max-microvolt = <1995000>;

				regulator-boot-on;

				regulator-always-on;

			};



			buck6_reg: BUCK6 {

				// BUCK8 in datasheet

				regulator-name = "BUCK6";

				regulator-min-microvolt = <800000>;

				regulator-max-microvolt = <1400000>;

				regulator-boot-on;

				regulator-always-on;

			};



			ldo1_reg: LDO1 {

				regulator-name = "LDO1";

				regulator-min-microvolt = <3000000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;

				regulator-always-on;

			};



			ldo2_reg: LDO2 {

				regulator-name = "LDO2";

				regulator-min-microvolt = <900000>;

				regulator-max-microvolt = <900000>;

				regulator-boot-on;

				regulator-always-on;

			};



			ldo3_reg: LDO3 {

				regulator-name = "LDO3";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;

				regulator-always-on;

			};



			ldo4_reg: LDO4 {

				regulator-name = "LDO4";

				regulator-min-microvolt = <900000>;

				regulator-max-microvolt = <1800000>;

				regulator-boot-on;

				regulator-always-on;

			};



			ldo6_reg: LDO6 {

				regulator-name = "LDO6";

				regulator-min-microvolt = <900000>;

				regulator-max-microvolt = <1800000>;

				regulator-boot-on;

				regulator-always-on;

			};

		};

	};

};



&iomuxc {

	pinctrl-names = "default";
@@ -124,12 +286,40 @@ 
		>;

	};



	pinctrl_gpio_wlf: gpiowlfgrp {

		fsl,pins = <

			MX8MM_IOMUXC_I2C4_SDA_GPIO5_IO21	0xd6

		>;

	};



	pinctrl_i2c1: i2c1grp {

		fsl,pins = <

			MX8MM_IOMUXC_I2C1_SCL_I2C1_SCL			0x400001c3

			MX8MM_IOMUXC_I2C1_SDA_I2C1_SDA			0x400001c3

		>;

	};



	pinctrl_pmic: pmicirq {

		fsl,pins = <

			MX8MM_IOMUXC_GPIO1_IO03_GPIO1_IO3		0x41

		>;

	};



	pinctrl_reg_usdhc2_vmmc: regusdhc2vmmc {

		fsl,pins = <

			MX8MM_IOMUXC_SD2_RESET_B_GPIO2_IO19	0x41

		>;

	};



	pinctrl_sai3: sai3grp {

		fsl,pins = <

			MX8MM_IOMUXC_SAI3_TXFS_SAI3_TX_SYNC     0xd6

			MX8MM_IOMUXC_SAI3_TXC_SAI3_TX_BCLK      0xd6

			MX8MM_IOMUXC_SAI3_MCLK_SAI3_MCLK        0xd6

			MX8MM_IOMUXC_SAI3_TXD_SAI3_TX_DATA0     0xd6

		>;

	};



	pinctrl_uart2: uart2grp {

		fsl,pins = <

			MX8MM_IOMUXC_UART2_RXD_UART2_DCE_RX	0x140