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
115 lines
2.6 KiB
Diff
115 lines
2.6 KiB
Diff
From 4490cfa66379909cdddc3518c8e75b7cd26d8f69 Mon Sep 17 00:00:00 2001
|
|
From: Andy Gross <agross@codeaurora.org>
|
|
Date: Mon, 16 Jun 2014 16:53:49 -0500
|
|
Subject: [PATCH 151/182] ARM: ipq8064: Add nand device info
|
|
|
|
Signed-off-by: Andy Gross <agross@codeaurora.org>
|
|
---
|
|
arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 34 ++++++++++++++++++++++++++++++
|
|
arch/arm/boot/dts/qcom-ipq8064.dtsi | 33 +++++++++++++++++++++++++++++
|
|
2 files changed, 67 insertions(+)
|
|
|
|
diff --git a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
|
|
index c752889..4062eb6 100644
|
|
--- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
|
|
+++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
|
|
@@ -45,6 +45,29 @@
|
|
bias-none;
|
|
};
|
|
};
|
|
+ nand_pins: nand_pins {
|
|
+ mux {
|
|
+ pins = "gpio34", "gpio35", "gpio36",
|
|
+ "gpio37", "gpio38", "gpio39",
|
|
+ "gpio40", "gpio41", "gpio42",
|
|
+ "gpio43", "gpio44", "gpio45",
|
|
+ "gpio46", "gpio47";
|
|
+ function = "nand";
|
|
+ drive-strength = <10>;
|
|
+ bias-disable;
|
|
+ };
|
|
+ pullups {
|
|
+ pins = "gpio39";
|
|
+ bias-pull-up;
|
|
+ };
|
|
+ hold {
|
|
+ pins = "gpio40", "gpio41", "gpio42",
|
|
+ "gpio43", "gpio44", "gpio45",
|
|
+ "gpio46", "gpio47";
|
|
+ bias-bus-hold;
|
|
+ };
|
|
+ };
|
|
+
|
|
};
|
|
|
|
gsbi@16300000 {
|
|
@@ -126,5 +149,16 @@
|
|
sata@29000000 {
|
|
status = "ok";
|
|
};
|
|
+
|
|
+ dma@18300000 {
|
|
+ status = "ok";
|
|
+ };
|
|
+
|
|
+ nand@0x1ac00000 {
|
|
+ status = "ok";
|
|
+
|
|
+ pinctrl-0 = <&nand_pins>;
|
|
+ pinctrl-names = "default";
|
|
+ };
|
|
};
|
|
};
|
|
diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
|
index 93c0315..d9fce15 100644
|
|
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
|
+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
|
@@ -76,6 +76,7 @@
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
interrupts = <0 32 0x4>;
|
|
+
|
|
};
|
|
|
|
intc: interrupt-controller@2000000 {
|
|
@@ -369,5 +370,37 @@
|
|
phy-names = "sata-phy";
|
|
status = "disabled";
|
|
};
|
|
+
|
|
+ adm_dma: dma@18300000 {
|
|
+ compatible = "qcom,adm";
|
|
+ reg = <0x18300000 0x100000>;
|
|
+ interrupts = <0 170 0>;
|
|
+
|
|
+ clocks = <&gcc ADM0_CLK>, <&gcc ADM0_PBUS_CLK>;
|
|
+ clock-names = "core_clk", "iface_clk";
|
|
+
|
|
+ resets = <&gcc ADM0_RESET>,
|
|
+ <&gcc ADM0_PBUS_RESET>,
|
|
+ <&gcc ADM0_C0_RESET>,
|
|
+ <&gcc ADM0_C1_RESET>,
|
|
+ <&gcc ADM0_C2_RESET>;
|
|
+
|
|
+ reset-names = "adm", "pbus", "c0", "c1", "c2";
|
|
+
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
+ nand@0x1ac00000 {
|
|
+ compatible = "qcom,qcom_nand";
|
|
+ reg = <0x1ac00000 0x800>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <1>;
|
|
+
|
|
+ clocks = <&gcc EBI2_CLK>;
|
|
+ clock-names = "core_clk";
|
|
+
|
|
+
|
|
+ status = "disabled";
|
|
+ };
|
|
};
|
|
};
|
|
--
|
|
1.7.10.4
|
|
|