Merge "ARM: dts: msm: add support of PM660a based SDM630 platform" (b6579def) · Commits · e / devices / android_kernel_sony_msm8998

arch/arm/boot/dts/qcom/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -161,7 +161,8 @@ dtb-$(CONFIG_ARCH_SDM660) += sdm660-sim.dtb \
		sda660-pm660a-mtp.dtb \
		sda660-pm660a-rcm.dtb

		dtb-$(CONFIG_ARCH_SDM630) += sdm630-rumi.dtb
		dtb-$(CONFIG_ARCH_SDM630) += sdm630-rumi.dtb \
		sdm630-pm660a-rumi.dtb

		ifeq ($(CONFIG_ARM64),y)
		always := $(dtb-y)

arch/arm/boot/dts/qcom/sdm630-pm660a-rumi.dts

0 → 100644

+88 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		* only version 2 as published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*/


		/dts-v1/;

		#include "sdm630.dtsi"
		#include "sdm660-pinctrl.dtsi"
		#include "msm-pm660a.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660A RUMI";
		compatible = "qcom,sdm630-rumi", "qcom,sdm630", "qcom,rumi";
		qcom,board-id = <15 0>;
		qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;

		chosen {
		bootargs = "lpm_levels.sleep_disabled=1";
		};
		};

		&usb3 {
		/delete-property/ USB3_GDSC-supply;
		/delete-property/ extcon;
		dwc3@a800000 {
		maximum-speed = "high-speed";
		};
		};

		&ssphy {
		compatible = "usb-nop-xceiv";
		};

		&qusb_phy0 {
		reg = <0x0a928000 0x8000>,
		<0x0a8f8800 0x400>,
		<0x0a920000 0x100>;
		reg-names = "qusb_phy_base",
		"qscratch_base",
		"emu_phy_base";
		qcom,emulation;
		qcom,qusb-phy-init-seq = <0x19 0x1404
		0x20 0x1414
		0x79 0x1410
		0x00 0x1418
		0x99 0x1404
		0x04 0x1408
		0xd9 0x1404>;
		qcom,emu-dcm-reset-seq = <0x100000 0x20
		0x0 0x20
		0x1a0 0x20
		0x5 0x14>;
		};

		&uartblsp1dm1 {
		status = "ok";
		pinctrl-names = "default";
		pinctrl-0 = <&uart_console_active>;
		};

		&clock_gcc {
		compatible = "qcom,dummycc";
		clock-output-names = "gcc_clocks";
		};

		&clock_gfx {
		compatible = "qcom,dummycc";
		clock-output-names = "gfx_clocks";
		};

		&clock_mmss {
		compatible = "qcom,dummycc";
		clock-output-names = "mmss_clocks";
		};

		&clock_debug {
		compatible = "qcom,dummycc";
		clock-output-names = "debug_clocks";
		};

arch/arm/boot/dts/qcom/sdm630-rumi.dts

+4 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -17,9 +17,11 @@
		#include "sdm660-pinctrl.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. SDM 630 RUMI";
		model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660L RUMI";
		compatible = "qcom,sdm630-rumi", "qcom,sdm630", "qcom,rumi";
		qcom,board-id = <15 0>;
		qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
		<0x0001001b 0x0201011a 0x0 0x0>;

		chosen {
		bootargs = "lpm_levels.sleep_disabled=1";