Unverified Commit 4d314179 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-dts-for-5.15' of... 

Merge tag 'qcom-dts-for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/dt

Qualcomm dts updates for v5.15

This introduces the MSM8226 platform and an initial dts for the Samsung
Galaxy S III Neo phone.

MSM8974 gains another UART and this is used to enable Bluetooth on the
Sony Xperia Z2 Tablet. Samsung Galaxy S5 gains regulator definitions for
audio and modem remoteprocs, effectively enabling these.

DSI clocks on APQ8064 are updates as the old legacy clock names are no
longer supported by the driver. And IPQ806x GMAC nodes gains AHB resets
wired up.

Lastly APQ8060 is converted to a SPDX header and the ethernet node is
updates in accordance with the binding.

* tag 'qcom-dts-for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  ARM: dts: qcom: add ahb reset to ipq806x-gmac
  ARM: dts: qcom: Fix up APQ8060 DragonBoard license
  ARM: dts: qcom: msm8974: castor: Add Bluetooth-related nodes
  ARM: dts: qcom: msm8974: Add blsp2_uart7 for bluetooth on sirius
  ARM: dts: qcom: Add initial DTS file for Samsung Galaxy S III Neo phone
  dt-bindings: arm: qcom: Document MSM8226 SoC binding
  ARM: dts: qcom: Add support for MSM8226 SoC
  ARM: dts: qcom: apq8060: Correct Ethernet node name and drop bogus irq property
  ARM: dts: qcom: apq8064: correct clock names
  ARM: dts: qcom: msm8974-klte: Enable remote processors

Link: https://lore.kernel.org/r/20210816211957.579365-1-bjorn.andersson@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9b35ab1e f95c4c56

Documentation/devicetree/bindings/arm/qcom.yaml

+6 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ description: | 
        ipq6018

        ipq8074

        mdm9615

        msm8226

        msm8916

        msm8974

        msm8992
@@ -114,6 +115,11 @@ properties: 
              - qcom,apq8084-sbc

          - const: qcom,apq8084



      - items:

          - enum:

              - samsung,s3ve3g

          - const: qcom,msm8226



      - items:

          - enum:

              - qcom,msm8960-cdp

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -957,6 +957,7 @@ dtb-$(CONFIG_ARCH_QCOM) += \ 
	qcom-ipq4019-ap.dk07.1-c2.dtb \

	qcom-ipq8064-ap148.dtb \

	qcom-ipq8064-rb3011.dtb \

	qcom-msm8226-samsung-s3ve3g.dtb \

	qcom-msm8660-surf.dtb \

	qcom-msm8960-cdp.dtb \

	qcom-msm8974-fairphone-fp2.dtb \

arch/arm/boot/dts/qcom-apq8060-dragonboard.dts

+1 −22
Original line number Diff line number Diff line 
/*

 * Copyright 2016 Linaro Ltd

 *

 * Permission is hereby granted, free of charge, to any person obtaining a copy

 * of this software and associated documentation files (the "Software"), to deal

 * in the Software without restriction, including without limitation the rights

 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

 * copies of the Software, and to permit persons to whom the Software is

 * furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 * THE SOFTWARE.

 */



// SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

#include <dt-bindings/input/input.h>

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>

arch/arm/boot/dts/qcom-apq8064.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -1262,9 +1262,9 @@ 
				<&mmcc DSI1_BYTE_CLK>,

				<&mmcc DSI_PIXEL_CLK>,

				<&mmcc DSI1_ESC_CLK>;

			clock-names = "iface_clk", "bus_clk", "core_mmss_clk",

					"src_clk", "byte_clk", "pixel_clk",

					"core_clk";

			clock-names = "iface", "bus", "core_mmss",

					"src", "byte", "pixel",

					"core";



			assigned-clocks = <&mmcc DSI1_BYTE_SRC>,

					<&mmcc DSI1_ESC_SRC>,

arch/arm/boot/dts/qcom-ipq8064.dtsi

+12 −8
Original line number Diff line number Diff line
@@ -980,8 +980,9 @@ 
			clocks = <&gcc GMAC_CORE1_CLK>;

			clock-names = "stmmaceth";



			resets = <&gcc GMAC_CORE1_RESET>;

			reset-names = "stmmaceth";

			resets = <&gcc GMAC_CORE1_RESET>,

				 <&gcc GMAC_AHB_RESET>;

			reset-names = "stmmaceth", "ahb";



			status = "disabled";

		};
@@ -1003,8 +1004,9 @@ 
			clocks = <&gcc GMAC_CORE2_CLK>;

			clock-names = "stmmaceth";



			resets = <&gcc GMAC_CORE2_RESET>;

			reset-names = "stmmaceth";

			resets = <&gcc GMAC_CORE2_RESET>,

				 <&gcc GMAC_AHB_RESET>;

			reset-names = "stmmaceth", "ahb";



			status = "disabled";

		};
@@ -1026,8 +1028,9 @@ 
			clocks = <&gcc GMAC_CORE3_CLK>;

			clock-names = "stmmaceth";



			resets = <&gcc GMAC_CORE3_RESET>;

			reset-names = "stmmaceth";

			resets = <&gcc GMAC_CORE3_RESET>,

				 <&gcc GMAC_AHB_RESET>;

			reset-names = "stmmaceth", "ahb";



			status = "disabled";

		};
@@ -1049,8 +1052,9 @@ 
			clocks = <&gcc GMAC_CORE4_CLK>;

			clock-names = "stmmaceth";



			resets = <&gcc GMAC_CORE4_RESET>;

			reset-names = "stmmaceth";

			resets = <&gcc GMAC_CORE4_RESET>,

				 <&gcc GMAC_AHB_RESET>;

			reset-names = "stmmaceth", "ahb";



			status = "disabled";

		};