Commit 5f7067bc authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

i.MX arm64 device tree change for 5.10:

- New board/device support: Librem 5 phone, i.MX8MM DDR4 EVK, Variscite
  VAR-SOM-MX8MN SoM and Symphony board.
- Add NWL MIPI DSI controller support for i.MX8MQ.
- Several series from Krzysztof Kozlowski to clean and fix up i.MX8
  based device trees according to DT schema.
- A series from Michael Walle to add sl28cpld support for Kontron sl28
  device based on LS1028A.
- Add two parameters for Samsung picophy tuning on imx8mm-evk and
  imx8mn-evk boards.
- Add more thermal zones for Layerscape SoCs.
- Various random update and minor fix-ups.

* tag 'imx-dt64-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (71 commits)
  arm64: dts: imx8mq-librem5: correct GPIO hog property
  arm64: dts: imx8mm-var-som-symphony: Drop wake-up source from RTC
  arm64: dts: imx8mq: correct interrupt flags
  arm64: dts: imx8mn: correct interrupt flags
  arm64: dts: imx8mm: correct interrupt flags
  arm64: dts: imx8mm-var-som-symphony: fix ptn5150 interrupts
  arm64: dts: layerscape: correct watchdog clocks for LS1088A
  arm64: dts: freescale: sl28: enable fan support
  arm64: dts: freescale: sl28: enable LED support
  arm64: dts: freescale: sl28: map GPIOs to input events
  arm64: dts: freescale: sl28: enable sl28cpld
  arm64: dts: imx8mq-evk: Add MIPI DSI support
  arm64: dts: layerscape: Add label to pcie nodes
  arm64: dts: imx8mn-var-som-symphony: Add Variscite Symphony board with VAR-SOM-MX8MN
  arm64: dts: imx8mn-var-som: Add Variscite VAR-SOM-MX8MN System on Module
  arm64: dts: imx8mn-ddr4-evk: Remove unneeded PMIC pin configuration
  arm64: dts: imx8mm-var-som-symphony: Adjust ethernet pin configuration
  arm64: dts: imx8mm-var-som-symphony: Remove unneeded i2c3 properties
  arm64: dts: imx8mm-var-som-symphony: Drop unused gpioledgrp
  arm64: dts: imx8mq-librem5: Add interrupt-names to ti,tps6598x
  ...

Link: https://lore.kernel.org/r/20200923073009.23678-5-shawnguo@kernel.org


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2b7cfaaf 912a6e2e

arch/arm64/boot/dts/freescale/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -29,12 +29,17 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-qds.dtb 
dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-lx2160a-rdb.dtb



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

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

dtb-$(CONFIG_ARCH_MXC) += imx8mm-var-som-symphony.dtb

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

dtb-$(CONFIG_ARCH_MXC) += imx8mn-ddr4-evk.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mn-var-som-symphony.dtb

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

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

dtb-$(CONFIG_ARCH_MXC) += imx8mq-hummingboard-pulse.dtb

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

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

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

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

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

dtb-$(CONFIG_ARCH_MXC) += imx8mq-pico-pi.dtb

arch/arm64/boot/dts/freescale/fsl-ls1012a-oxalis.dts

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ 
	status = "okay";

};



&pcie {

&pcie1 {

	status = "okay";

};

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

+3 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * Device Tree Include file for Freescale Layerscape-1012A family SoC.

 * Device Tree Include file for NXP Layerscape-1012A family SoC.

 *

 * Copyright 2016 Freescale Semiconductor, Inc.

 * Copyright 2019-2020 NXP

 *

 */
@@ -489,7 +490,7 @@ 
			interrupts = <0 126 IRQ_TYPE_LEVEL_HIGH>;

		};



		pcie: pcie@3400000 {

		pcie1: pcie@3400000 {

			compatible = "fsl,ls1012a-pcie";

			reg = <0x00 0x03400000 0x0 0x00100000   /* controller registers */

			       0x40 0x00000000 0x0 0x00002000>; /* configuration space */

arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts

+18 −0
Original line number Diff line number Diff line
@@ -11,11 +11,29 @@ 


/dts-v1/;

#include "fsl-ls1028a-kontron-sl28-var4.dts"

#include <dt-bindings/leds/common.h>



/ {

	model = "Kontron KBox A-230-LS";

	compatible = "kontron,kbox-a-230-ls", "kontron,sl28-var4",

		     "kontron,sl28", "fsl,ls1028a";



	leds {

		compatible = "gpio-leds";



		alarm-led {

			function = LED_FUNCTION_ALARM;

			color = <LED_COLOR_ID_YELLOW>;

			gpios = <&sl28cpld_gpio0 0 GPIO_ACTIVE_HIGH>;

		};



		power-led {

			linux,default-trigger = "default-on";

			function = LED_FUNCTION_POWER;

			color = <LED_COLOR_ID_GREEN>;

			gpios = <&sl28cpld_gpio1 3 GPIO_ACTIVE_HIGH>;

		};

	};

};



&enetc_mdio_pf3 {

arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var3-ads2.dts

+9 −0
Original line number Diff line number Diff line
@@ -15,6 +15,15 @@ 
	compatible = "kontron,sl28-var3-ads2", "kontron,sl28-var3",

		     "kontron,sl28", "fsl,ls1028a";



	pwm-fan {

		compatible = "pwm-fan";

		cooling-min-state = <0>;

		cooling-max-state = <3>;

		#cooling-cells = <2>;

		pwms = <&sl28cpld_pwm0 0 4000000>;

		cooling-levels = <1 128 192 255>;

	};



	sound {

		#address-cells = <1>;

		#size-cells = <0>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE