Unverified Commit 4503fc6e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX arm64 device tree change for 6.3:

- New board support: i.MX8MP Beacon Kit, Debix Model A Board,
  Verdin Yavia boards.
- Add Flexcan and ADC support for i.MX93.
- A series from Krzysztof Kozlowski to align LED node names with
  dtschema and use generic node name for rave-sp.
- Move PCIe controller clock setup from board dts to SoC dtsi.
- Add clock-cells to i.MX8MP hsio-blk-ctrl device.
- Add TMU phandle to calibration data in OCOTP for i.MX8M.
- Improve bluetooth UART on DH electronics i.MX8M Plus DHCOM.
- Drop sd-vsel-gpios from i.MX8M Verdin SoM and DHCOM SoM.
- A series from Peng Fan to improve iomuxc-gpr device for i.MX8M.
- Declare IOMMU cache-coherent page table walk feature for LS1028A and
  LS1088A.
- A few small corrections and random updates.

* tag 'imx-dt64-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (50 commits)
  arm64: ls1046ardb: Use in-band-status for SFP module
  arm64: dts: imx8mp-verdin: Add yavia carrier board
  arm64: dts: imx8mm-verdin: Add yavia carrier board
  arm64: dts: imx8q: use generic node name for rave-sp
  arm64: dts: imx8mp-verdin-dev: Do not include dahlia dtsi
  arm64: dts: imx8mm-verdin-dev: Do not include dahlia dtsi
  arm64: dts: imx8mp: Drop sd-vsel-gpios from i.MX8M Plus DHCOM SoM
  arm64: dts: imx8mp: Drop sd-vsel-gpios from i.MX8M Plus Verdin SoM
  arm64: dts: imx8mm: Drop sd-vsel-gpios from i.MX8M Mini Verdin SoM
  arm64: dts: imx8mp: Improve bluetooth UART on DH electronics i.MX8M Plus DHCOM
  arm64: dts: freescale: Introduce imx8mp-beacon-kit
  arm64: dts: imx8mm-evk: use correct gpio-expander compatible
  arm64: dts: imx93: add ADC support
  arm64: dts: imx8mp: Reorder clock to match fsl,imx6q-pcie.yaml
  arm64: dts: imx8mq: Deduplicate PCIe clock-names property
  arm64: dts: imx8mm: Deduplicate PCIe clock-names property
  arm64: dts: verdin-imx8mp: unify gpio-key node name
  arm64: dts: ls1028a: sl28: get MAC addresses from VPD
  arm64: dts: freescale: Add LVDS overlay for TQMa8MPxL
  arm64: dts: imx8mp: Add LCDIF2 & LDB nodes
  ...

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 739a7c29 46e82802

arch/arm64/boot/dts/freescale/Makefile

+10 −0
Original line number Diff line number Diff line
@@ -75,8 +75,10 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw7903.dtb 
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw7904.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-verdin-nonwifi-dahlia.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-verdin-nonwifi-dev.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-verdin-nonwifi-yavia.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-verdin-wifi-dahlia.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-verdin-wifi-dev.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mm-verdin-wifi-yavia.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mn-beacon-kit.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mn-bsh-smm-s2.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mn-bsh-smm-s2pro.dtb
@@ -86,6 +88,8 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mn-ddr4-evk.dtb 
dtb-$(CONFIG_ARCH_MXC) += imx8mn-tqma8mqnl-mba8mx.dtb

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

dtb-$(CONFIG_ARCH_MXC) += imx8mn-venice-gw7902.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mp-beacon-kit.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mp-debix-model-a.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mp-dhcom-pdk2.dtb

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

dtb-$(CONFIG_ARCH_MXC) += imx8mp-icore-mx8mp-edimm2.2.dtb
@@ -95,8 +99,14 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mp-tqma8mpql-mba8mpxl.dtb 
dtb-$(CONFIG_ARCH_MXC) += imx8mp-venice-gw74xx.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mp-verdin-nonwifi-dahlia.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mp-verdin-nonwifi-dev.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mp-verdin-nonwifi-yavia.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mp-verdin-wifi-dahlia.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mp-verdin-wifi-dev.dtb

dtb-$(CONFIG_ARCH_MXC) += imx8mp-verdin-wifi-yavia.dtb



imx8mp-tqma8mpql-mba8mpxl-lvds-dtbs += imx8mp-tqma8mpql-mba8mpxl.dtb imx8mp-tqma8mpql-mba8mpxl-lvds.dtbo

dtb-$(CONFIG_ARCH_MXC) += imx8mp-tqma8mpql-mba8mpxl-lvds.dtb



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

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

dtb-$(CONFIG_ARCH_MXC) += imx8mq-kontron-pitx-imx8m.dtb

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

+12 −0
Original line number Diff line number Diff line
@@ -56,10 +56,14 @@ qsgmii_phy3: ethernet-phy@10 { 
};



&enetc_port2 {

	nvmem-cells = <&base_mac_address 2>;

	nvmem-cell-names = "mac-address";

	status = "okay";

};



&enetc_port3 {

	nvmem-cells = <&base_mac_address 3>;

	nvmem-cell-names = "mac-address";

	status = "okay";

};
@@ -80,6 +84,8 @@ &mscc_felix_port0 { 
	managed = "in-band-status";

	phy-handle = <&qsgmii_phy0>;

	phy-mode = "qsgmii";

	nvmem-cells = <&base_mac_address 4>;

	nvmem-cell-names = "mac-address";

	status = "okay";

};
@@ -88,6 +94,8 @@ &mscc_felix_port1 { 
	managed = "in-band-status";

	phy-handle = <&qsgmii_phy1>;

	phy-mode = "qsgmii";

	nvmem-cells = <&base_mac_address 5>;

	nvmem-cell-names = "mac-address";

	status = "okay";

};
@@ -96,6 +104,8 @@ &mscc_felix_port2 { 
	managed = "in-band-status";

	phy-handle = <&qsgmii_phy2>;

	phy-mode = "qsgmii";

	nvmem-cells = <&base_mac_address 6>;

	nvmem-cell-names = "mac-address";

	status = "okay";

};
@@ -104,6 +114,8 @@ &mscc_felix_port3 { 
	managed = "in-band-status";

	phy-handle = <&qsgmii_phy3>;

	phy-mode = "qsgmii";

	nvmem-cells = <&base_mac_address 7>;

	nvmem-cell-names = "mac-address";

	status = "okay";

};

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

+2 −0
Original line number Diff line number Diff line
@@ -55,5 +55,7 @@ &enetc_port0 { 
&enetc_port1 {

	phy-handle = <&phy0>;

	phy-mode = "rgmii-id";

	nvmem-cells = <&base_mac_address 0>;

	nvmem-cell-names = "mac-address";

	status = "okay";

};

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

+8 −0
Original line number Diff line number Diff line
@@ -36,10 +36,14 @@ &enetc_port0 { 
};



&enetc_port2 {

	nvmem-cells = <&base_mac_address 2>;

	nvmem-cell-names = "mac-address";

	status = "okay";

};



&enetc_port3 {

	nvmem-cells = <&base_mac_address 3>;

	nvmem-cell-names = "mac-address";

	status = "okay";

};
@@ -52,6 +56,8 @@ &mscc_felix_port0 { 
	managed = "in-band-status";

	phy-handle = <&phy0>;

	phy-mode = "sgmii";

	nvmem-cells = <&base_mac_address 0>;

	nvmem-cell-names = "mac-address";

	status = "okay";

};
@@ -60,6 +66,8 @@ &mscc_felix_port1 { 
	managed = "in-band-status";

	phy-handle = <&phy1>;

	phy-mode = "sgmii";

	nvmem-cells = <&base_mac_address 1>;

	nvmem-cell-names = "mac-address";

	status = "okay";

};

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

+2 −0
Original line number Diff line number Diff line
@@ -43,5 +43,7 @@ vddh: vddh-regulator { 
&enetc_port1 {

	phy-handle = <&phy1>;

	phy-mode = "rgmii-id";

	nvmem-cells = <&base_mac_address 1>;

	nvmem-cell-names = "mac-address";

	status = "okay";

};