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

Commit c6a893f8 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'qcom-dts-for-4.18-2' of... 

Merge tag 'qcom-dts-for-4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt

Qualcomm Device Tree Changes for v4.18 - Part 2

* Numerous updates for IPQ8074 and IPQ4019 based devices
* Add support for Sony Xperia Z1 Compact

* tag 'qcom-dts-for-4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux

:
  ARM: dts: ipq8074: Enable few peripherals for hk01 board
  ARM: dts: ipq8074: Add pcie nodes
  ARM: dts: ipq8074: Add peripheral nodes
  ARM: dts: ipq4019: Add qcom-ipq4019-ap.dk07.1-c2 board file
  ARM: dts: ipq4019: Add qcom-ipq4019-ap.dk07.1-c1 board file
  ARM: dts: ipq4019: Add ipq4019-ap.dk07.1 common data
  ARM: dts: ipq4019: Add qcom-ipq4019-ap.dk04.1-c3 board file
  ARM: dts: ipq4019: Add ipq4019-ap.dk04.1-c1 board file
  ARM: dts: ipq4019: Add ipq4019-ap.dk04.dtsi
  ARM: dts: ipq4019: Change the max opp frequency
  ARM: dts: ipq4019: Add a few peripheral nodes
  ARM: dts: ipq4019: Add a default chosen node
  ARM: dts: qcom: msm8974: Add Sony Xperia Z1 Compact

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents afc57b18 0e4c9820

arch/arm/boot/dts/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -767,12 +767,17 @@ dtb-$(CONFIG_ARCH_QCOM) += \ 
	qcom-apq8084-ifc6540.dtb \

	qcom-apq8084-mtp.dtb \

	qcom-ipq4019-ap.dk01.1-c1.dtb \

	qcom-ipq4019-ap.dk04.1-c1.dtb \

	qcom-ipq4019-ap.dk04.1-c3.dtb \

	qcom-ipq4019-ap.dk07.1-c1.dtb \

	qcom-ipq4019-ap.dk07.1-c2.dtb \

	qcom-ipq8064-ap148.dtb \

	qcom-msm8660-surf.dtb \

	qcom-msm8960-cdp.dtb \

	qcom-msm8974-fairphone-fp2.dtb \

	qcom-msm8974-lge-nexus5-hammerhead.dtb \

	qcom-msm8974-samsung-klte.dtb \

	qcom-msm8974-sony-xperia-amami.dtb \

	qcom-msm8974-sony-xperia-castor.dtb \

	qcom-msm8974-sony-xperia-honami.dtb \

	qcom-mdm9615-wp8548-mangoh-green.dtb

arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi

+9 −1
Original line number Diff line number Diff line
@@ -20,6 +20,14 @@ 
	model = "Qualcomm Technologies, Inc. IPQ4019/AP-DK01.1";

	compatible = "qcom,ipq4019";



	aliases {

		serial0 = &blsp1_uart1;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	soc {

		rng@22000 {

			status = "ok";
@@ -61,7 +69,7 @@ 
			status = "ok";

		};



		spi_0: spi@78b5000 {

		spi@78b5000 {

			pinctrl-0 = <&spi_0_pins>;

			pinctrl-names = "default";

			status = "ok";

arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts

0 → 100644
+19 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

// Copyright (c) 2018, The Linux Foundation. All rights reserved.



#include "qcom-ipq4019-ap.dk04.1.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. IPQ4019/AP-DK04.1-C1";

	compatible = "qcom,ipq4019-dk04.1-c1";



	soc {

		dma@7984000 {

			status = "ok";

		};



		qpic-nand@79b0000 {

			status = "ok";

		};

	};

};

arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c3.dts

0 → 100644
+9 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

// Copyright (c) 2018, The Linux Foundation. All rights reserved.



#include "qcom-ipq4019-ap.dk04.1.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. IPQ4019/AP-DK04.1-C3";

	compatible = "qcom,ipq4019-ap-dk04.1-c3";

};

arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi

0 → 100644
+111 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

// Copyright (c) 2018, The Linux Foundation. All rights reserved.



#include "qcom-ipq4019.dtsi"

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

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



/ {

	model = "Qualcomm Technologies, Inc. IPQ4019/AP-DK04.1";



	aliases {

		serial0 = &blsp1_uart1;

		serial1 = &blsp1_uart2;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	memory {

		device_type = "memory";

		reg = <0x80000000 0x10000000>; /* 256MB */

	};



	soc {

		pinctrl@1000000 {

			serial_0_pins: serial0-pinmux {

				pins = "gpio16", "gpio17";

				function = "blsp_uart0";

				bias-disable;

			};



			serial_1_pins: serial1-pinmux {

				pins = "gpio8", "gpio9",

					"gpio10", "gpio11";

				function = "blsp_uart1";

				bias-disable;

			};



			spi_0_pins: spi-0-pinmux {

				pinmux {

					function = "blsp_spi0";

					pins = "gpio13", "gpio14", "gpio15";

					bias-disable;

				};

				pinmux_cs {

					function = "gpio";

					pins = "gpio12";

					bias-disable;

					output-high;

				};

			};



			i2c_0_pins: i2c-0-pinmux {

				pins = "gpio20", "gpio21";

				function = "blsp_i2c0";

				bias-disable;

			};



			nand_pins: nand-pins {

				pins = "gpio53", "gpio55", "gpio56",

					"gpio57", "gpio58", "gpio59",

					"gpio60", "gpio62", "gpio63",

					"gpio64", "gpio65", "gpio66",

					"gpio67", "gpio68", "gpio69";

				function = "qpic";

			};

		};



		serial@78af000 {

			pinctrl-0 = <&serial_0_pins>;

			pinctrl-names = "default";

			status = "ok";

		};



		serial@78b0000 {

			pinctrl-0 = <&serial_1_pins>;

			pinctrl-names = "default";

			status = "ok";

		};



		dma@7884000 {

			status = "ok";

		};



		spi@78b5000 { /* BLSP1 QUP1 */

			pinctrl-0 = <&spi_0_pins>;

			pinctrl-names = "default";

			status = "ok";

			cs-gpios = <&tlmm 12 0>;



			m25p80@0 {

				#address-cells = <1>;

				#size-cells = <1>;

				reg = <0>;

				compatible = "n25q128a11";

				spi-max-frequency = <24000000>;

			};

		};



		pci@40000000 {

			status = "ok";

			perst-gpio = <&tlmm 38 0x1>;

		};



		qpic-nand@79b0000 {

			pinctrl-0 = <&nand_pins>;

			pinctrl-names = "default";

		};

	};

};