3c1f6e358d
Patches are generated using the "format-patch" command from the following location: *https://www.codeaurora.org/cgit/quic/kernel/galak-msm/log/?h=apq_ipq_base *rev=0771849495b4128cac2faf7d49c85c729fc48b20 Patches numbered 76/77/102/103 have already been integrated in 3.14.12, so they're not in this list. All these patches are either integrated are pending integration into kernel.org, therefore these patches should go away once the kernel gets upgraded to 3.16. Support is currently limited to AP148 board but can be extended to other platforms in the future. These changes do not cover ethernet connectivity. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> SVN-Revision: 42334
186 lines
4.2 KiB
Diff
186 lines
4.2 KiB
Diff
From 63495b04141e60ceb40d4632a41b7cd4a3d23dd2 Mon Sep 17 00:00:00 2001
|
|
From: Kumar Gala <galak@codeaurora.org>
|
|
Date: Wed, 28 May 2014 12:01:29 -0500
|
|
Subject: [PATCH 091/182] ARM: dts: qcom: Update msm8974/apq8074 device trees
|
|
|
|
* Move SoC peripherals into an SoC container node
|
|
* Move serial enabling into board file (qcom-apq8074-dragonboard.dts)
|
|
* Move spi pinctrl into board file
|
|
* Cleanup cpu node to match binding spec, enable-method and compatible
|
|
should be per cpu, not part of the container
|
|
* Drop interrupts property from l2-cache node as its not part of the
|
|
binding spec
|
|
* Move timer node out of SoC container
|
|
|
|
Signed-off-by: Kumar Gala <galak@codeaurora.org>
|
|
---
|
|
arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 28 +++++++++++++-
|
|
arch/arm/boot/dts/qcom-msm8974.dtsi | 49 +++++++++---------------
|
|
2 files changed, 45 insertions(+), 32 deletions(-)
|
|
|
|
diff --git a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
|
|
index 92320c4..b4dfb01 100644
|
|
--- a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
|
|
+++ b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
|
|
@@ -4,7 +4,11 @@
|
|
model = "Qualcomm APQ8074 Dragonboard";
|
|
compatible = "qcom,apq8074-dragonboard", "qcom,apq8074";
|
|
|
|
- soc: soc {
|
|
+ soc {
|
|
+ serial@f991e000 {
|
|
+ status = "ok";
|
|
+ };
|
|
+
|
|
sdhci@f9824900 {
|
|
bus-width = <8>;
|
|
non-removable;
|
|
@@ -15,5 +19,27 @@
|
|
cd-gpios = <&msmgpio 62 0x1>;
|
|
bus-width = <4>;
|
|
};
|
|
+
|
|
+
|
|
+ pinctrl@fd510000 {
|
|
+ spi8_default: spi8_default {
|
|
+ mosi {
|
|
+ pins = "gpio45";
|
|
+ function = "blsp_spi8";
|
|
+ };
|
|
+ miso {
|
|
+ pins = "gpio46";
|
|
+ function = "blsp_spi8";
|
|
+ };
|
|
+ cs {
|
|
+ pins = "gpio47";
|
|
+ function = "blsp_spi8";
|
|
+ };
|
|
+ clk {
|
|
+ pins = "gpio48";
|
|
+ function = "blsp_spi8";
|
|
+ };
|
|
+ };
|
|
+ };
|
|
};
|
|
};
|
|
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
|
|
index c530a33..69dca2a 100644
|
|
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
|
|
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
|
|
@@ -13,10 +13,10 @@
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
interrupts = <1 9 0xf04>;
|
|
- compatible = "qcom,krait";
|
|
- enable-method = "qcom,kpss-acc-v2";
|
|
|
|
cpu@0 {
|
|
+ compatible = "qcom,krait";
|
|
+ enable-method = "qcom,kpss-acc-v2";
|
|
device_type = "cpu";
|
|
reg = <0>;
|
|
next-level-cache = <&L2>;
|
|
@@ -24,6 +24,8 @@
|
|
};
|
|
|
|
cpu@1 {
|
|
+ compatible = "qcom,krait";
|
|
+ enable-method = "qcom,kpss-acc-v2";
|
|
device_type = "cpu";
|
|
reg = <1>;
|
|
next-level-cache = <&L2>;
|
|
@@ -31,6 +33,8 @@
|
|
};
|
|
|
|
cpu@2 {
|
|
+ compatible = "qcom,krait";
|
|
+ enable-method = "qcom,kpss-acc-v2";
|
|
device_type = "cpu";
|
|
reg = <2>;
|
|
next-level-cache = <&L2>;
|
|
@@ -38,6 +42,8 @@
|
|
};
|
|
|
|
cpu@3 {
|
|
+ compatible = "qcom,krait";
|
|
+ enable-method = "qcom,kpss-acc-v2";
|
|
device_type = "cpu";
|
|
reg = <3>;
|
|
next-level-cache = <&L2>;
|
|
@@ -47,7 +53,6 @@
|
|
L2: l2-cache {
|
|
compatible = "cache";
|
|
cache-level = <2>;
|
|
- interrupts = <0 2 0x4>;
|
|
qcom,saw = <&saw_l2>;
|
|
};
|
|
};
|
|
@@ -57,6 +62,15 @@
|
|
interrupts = <1 7 0xf04>;
|
|
};
|
|
|
|
+ timer {
|
|
+ compatible = "arm,armv7-timer";
|
|
+ interrupts = <1 2 0xf08>,
|
|
+ <1 3 0xf08>,
|
|
+ <1 4 0xf08>,
|
|
+ <1 1 0xf08>;
|
|
+ clock-frequency = <19200000>;
|
|
+ };
|
|
+
|
|
soc: soc {
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
@@ -71,15 +85,6 @@
|
|
<0xf9002000 0x1000>;
|
|
};
|
|
|
|
- timer {
|
|
- compatible = "arm,armv7-timer";
|
|
- interrupts = <1 2 0xf08>,
|
|
- <1 3 0xf08>,
|
|
- <1 4 0xf08>,
|
|
- <1 1 0xf08>;
|
|
- clock-frequency = <19200000>;
|
|
- };
|
|
-
|
|
timer@f9020000 {
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
@@ -190,6 +195,7 @@
|
|
interrupts = <0 108 0x0>;
|
|
clocks = <&gcc GCC_BLSP1_UART2_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>;
|
|
clock-names = "core", "iface";
|
|
+ status = "disabled";
|
|
};
|
|
|
|
sdhci@f9824900 {
|
|
@@ -229,25 +235,6 @@
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
interrupts = <0 208 0>;
|
|
-
|
|
- spi8_default: spi8_default {
|
|
- mosi {
|
|
- pins = "gpio45";
|
|
- function = "blsp_spi8";
|
|
- };
|
|
- miso {
|
|
- pins = "gpio46";
|
|
- function = "blsp_spi8";
|
|
- };
|
|
- cs {
|
|
- pins = "gpio47";
|
|
- function = "blsp_spi8";
|
|
- };
|
|
- clk {
|
|
- pins = "gpio48";
|
|
- function = "blsp_spi8";
|
|
- };
|
|
- };
|
|
};
|
|
};
|
|
};
|
|
--
|
|
1.7.10.4
|
|
|