Merge "ARM: dts: msm: Add support for MSMTHORIUM" (6cc6371c) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/devicetree/bindings/arm/msm/msm.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,9 @@ SoCs:
		- MSMTITANIUM
		compatible = "qcom,msmtitanium"

		- MSMTHORIUM
		compatible = "qcom,msmthorium"

		- MSMZIRC
		compatible = "qcom,msmzirc"

		@@ -220,6 +223,7 @@ compatible = "qcom,apq8052-cdp"
		compatible = "qcom,apq8052-mtp"
		compatible = "qcom,msmtitanium-rumi"
		compatible = "qcom,msmtitanium-sim"
		compatible = "qcom,msmthorium-rumi"
		compatible = "qcom,msmzirc-cdp"
		compatible = "qcom,msmzirc-mtp"
		compatible = "qcom,msmzirc-rumi"

arch/arm/boot/dts/qcom/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,8 @@ dtb-$(CONFIG_ARCH_MDM9640) += mdm9640-sim.dtb \
		dtb-$(CONFIG_ARCH_MDMCALIFORNIUM) += mdmcalifornium-sim.dtb \
		mdmcalifornium-rumi.dtb

		dtb-$(CONFIG_ARCH_MSMTHORIUM) += msmthorium-rumi.dtb

		dtb-$(CONFIG_ARCH_MSMTITANIUM) += msmtitanium-sim.dtb \
		msmtitanium-rumi.dtb

arch/arm/boot/dts/qcom/msmthorium-cpu.dtsi

0 → 100644

+115 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2015, 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.
		*/

		/ {
		cpus {
		#address-cells = <1>;
		#size-cells = <0>;
		cpu-map {
		cluster0 {
		core0 {
		cpu = <&CPU0>;
		};
		};

		cluster1 {
		core0 {
		cpu = <&CPU4>;
		};
		};
		};

		CPU0: cpu@0 {
		device_type = "cpu";
		compatible = "arm,cortex-a53";
		reg = <0x0>;
		enable-method = "spin-table";
		cpu-release-addr = <0x0 0x90000000>;
		qcom,acc = <&acc0>;
		next-level-cache = <&L2_0>;
		L2_0: l2-cache {
		compatible = "arm,arch-cache";
		cache-level = <2>;
		power-domain = <&l2ccc_0>;
		};
		};

		CPU4: cpu@100 {
		device_type = "cpu";
		compatible = "arm,cortex-a53";
		reg = <0x100>;
		enable-method = "spin-table";
		cpu-release-addr = <0x0 0x90000000>;
		qcom,acc = <&acc4>;
		next-level-cache = <&L2_1>;
		L2_1: l2-cache {
		compatible = "arm,arch-cache";
		cache-level = <2>;
		power-domain = <&l2ccc_1>;
		};
		};

		};
		};

		&soc {
		l2ccc_0: clock-controller@b111000 {
		compatible = "qcom,8916-l2ccc";
		reg = <0x0b111000 0x1000>;
		};

		l2ccc_1: clock-controller@b011000 {
		compatible = "qcom,8916-l2ccc";
		reg = <0x0b011000 0x1000>;
		};

		acc0:clock-controller@b088000 {
		compatible = "qcom,arm-cortex-acc";
		reg = <0x0b088000 0x1000>;
		};

		acc1:clock-controller@b098000 {
		compatible = "qcom,arm-cortex-acc";
		reg = <0x0b098000 0x1000>;
		};

		acc2:clock-controller@b0a8000 {
		compatible = "qcom,arm-cortex-acc";
		reg = <0x0b0a8000 0x1000>;
		};

		acc3:clock-controller@b0b8000 {
		compatible = "qcom,arm-cortex-acc";
		reg = <0x0b0b8000 0x1000>;
		};

		acc4:clock-controller@b188000 {
		compatible = "qcom,arm-cortex-acc";
		reg = <0x0b188000 0x1000>;
		};

		acc5:clock-controller@b198000 {
		compatible = "qcom,arm-cortex-acc";
		reg = <0x0b198000 0x1000>;
		};

		acc6:clock-controller@b1a8000 {
		compatible = "qcom,arm-cortex-acc";
		reg = <0x0b1a8000 0x1000>;
		};

		acc7:clock-controller@b1b8000 {
		compatible = "qcom,arm-cortex-acc";
		reg = <0x0b1b8000 0x1000>;
		};
		};

arch/arm/boot/dts/qcom/msmthorium-pinctrl.dtsi

0 → 100644

+54 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2015, 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.
		*/

		&soc {
		tlmm: pinctrl@1000000 {
		compatible = "qcom,msmthorium-pinctrl";
		reg = <0x1000000 0x300000>;
		interrupts = <0 208 0>;
		gpio-controller;
		#gpio-cells = <2>;
		interrupt-controller;
		#interrupt-cells = <2>;

		pmx-uartconsole {
		uart_console_active: uart_console_active {
		mux {
		pins = "gpio4", "gpio5";
		function = "blsp_uart2";
		};

		config {
		pins = "gpio4", "gpio5";
		drive-strength = <2>;
		bias-disable;
		};
		};

		uart_console_sleep: uart_console_sleep {
		mux {
		pins = "gpio4", "gpio5";
		function = "blsp_uart2";
		};

		config {
		pins = "gpio4", "gpio5";
		drive-strength = <2>;
		bias-pull-down;
		};
		};

		};

		};
		};

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

0 → 100644

+34 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2015, 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/;

		/memreserve/ 0x90000000 0x00000200;

		#include "msmthorium.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. MSMThorium RUMI";
		compatible = "qcom,msmthorium-rumi", "qcom,msmthorium", "qcom,rumi";
		qcom,board-id= <15 0>;
		};

		&soc {
		timer {
		clock-frequency = <10000000>;
		};
		};

		&blsp1_uart2 {
		status = "ok";
		};