summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Chauvet <kwizart@gmail.com>2015-02-15 17:28:54 +0100
committerNicolas Chauvet <kwizart@gmail.com>2015-02-15 17:28:54 +0100
commit26cb414cac1b67e1a9e93365922f9f646aedae6a (patch)
treef1c5a759e7cf65da9c86bf1d408952b171b77a8a
parent7f0d5bcf3622252ecaafcb429ab17b64f8c04c4b (diff)
downloadkernel-26cb414cac1b67e1a9e93365922f9f646aedae6a.tar.gz
kernel-26cb414cac1b67e1a9e93365922f9f646aedae6a.tar.xz
kernel-26cb414cac1b67e1a9e93365922f9f646aedae6a.zip
Add few patches from online-labs
-rw-r--r--0001-Add-onlinelabs-c1-device-tree.patch106
-rw-r--r--0002-Enable-onlinelabs-c1.patch26
-rw-r--r--0003-enable-hardware-I-O-coherency.patch32
3 files changed, 164 insertions, 0 deletions
diff --git a/0001-Add-onlinelabs-c1-device-tree.patch b/0001-Add-onlinelabs-c1-device-tree.patch
new file mode 100644
index 00000000..937869f6
--- /dev/null
+++ b/0001-Add-onlinelabs-c1-device-tree.patch
@@ -0,0 +1,106 @@
+From afabd6580111c3dddc07420a0603b9472b1b0f49 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Thu, 12 Feb 2015 14:35:54 +0100
+Subject: [PATCH 1/3] Add onlinelabs-c1 device-tree
+
+---
+ arch/arm/boot/dts/onlinelabs-c1.dts | 87 +++++++++++++++++++++++++++++++++++++
+ 1 file changed, 87 insertions(+)
+ create mode 100644 arch/arm/boot/dts/onlinelabs-c1.dts
+
+diff --git a/arch/arm/boot/dts/onlinelabs-c1.dts b/arch/arm/boot/dts/onlinelabs-c1.dts
+new file mode 100644
+index 0000000..a63b897
+--- /dev/null
++++ b/arch/arm/boot/dts/onlinelabs-c1.dts
+@@ -0,0 +1,87 @@
++/*
++ * Device Tree file for Online-Labs C1 Computing
++ *
++ * Copyright (C) 2012-2014 Marvell
++ * Copyright (C) 2014-2015 Online Labs
++ *
++ * Lior Amsalem <alior@marvell.com>
++ * Gregory CLEMENT <gregory.clement@free-electrons.com>
++ * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
++ * Manfred Touron <mtouron@ocs.online.net>
++ * Vincent Auclair <vauclair@online.net>
++ *
++ * This file is licensed under the terms of the GNU General Public
++ * License version 2. This program is licensed "as is" without any
++ * warranty of any kind, whether express or implied.
++ */
++
++/dts-v1/;
++#include "armada-xp-mv78460.dtsi"
++
++/ {
++ model = "Online Labs - C1 Computing";
++ compatible = "marvell,axp-db", "marvell,armadaxp-mv78460", "marvell,armadaxp", "marvell,armada-370-xp";
++
++ chosen {
++ bootargs = "console=ttyS0,9600 earlyprintk";
++ };
++
++ memory {
++ device_type = "memory";
++ reg = <0 0x00000000 0 0x80000000>; /* 2 GB */
++ };
++
++ soc {
++ ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000
++ MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
++ MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000>;
++
++ devbus-bootcs {
++ status = "okay";
++
++ /* Device Bus parameters are required */
++
++ /* Read parameters */
++ devbus,bus-width = <16>;
++ devbus,turn-off-ps = <60000>;
++ devbus,badr-skew-ps = <0>;
++ devbus,acc-first-ps = <124000>;
++ devbus,acc-next-ps = <248000>;
++ devbus,rd-setup-ps = <0>;
++ devbus,rd-hold-ps = <0>;
++
++ /* Write parameters */
++ devbus,sync-enable = <0>;
++ devbus,wr-high-ps = <60000>;
++ devbus,wr-low-ps = <60000>;
++ devbus,ale-wr-ps = <60000>;
++
++ };
++
++ internal-regs {
++ uart0: serial@12000 {
++ status = "okay";
++ };
++
++ eth0: ethernet@70000 {
++ status = "okay";
++ fixed-link = <1 1 1000 0 0>;
++ phy-mode = "sgmii";
++ };
++
++ mvsdio@d4000 {
++ pinctrl-0 = <&sdio_pins>;
++ pinctrl-names = "default";
++ status = "okay";
++ /* No CD or WP GPIOs */
++ broken-cd;
++ };
++
++ };
++ };
++ aliases {
++ ethernet0 = &eth0;
++ serial0 = &uart0;
++ };
++};
++
+--
+1.9.3
+
diff --git a/0002-Enable-onlinelabs-c1.patch b/0002-Enable-onlinelabs-c1.patch
new file mode 100644
index 00000000..690c4463
--- /dev/null
+++ b/0002-Enable-onlinelabs-c1.patch
@@ -0,0 +1,26 @@
+From 96b7d422551f1f3672cdb33bca2d14686b461069 Mon Sep 17 00:00:00 2001
+From: Nicolas Chauvet <kwizart@gmail.com>
+Date: Thu, 12 Feb 2015 14:38:41 +0100
+Subject: [PATCH 2/3] Enable onlinelabs-c1
+
+---
+ arch/arm/boot/dts/Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index 91bd5bd..8a69403 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -544,7 +544,8 @@ dtb-$(CONFIG_MACH_ARMADA_XP) += \
+ armada-xp-matrix.dtb \
+ armada-xp-netgear-rn2120.dtb \
+ armada-xp-openblocks-ax3-4.dtb \
+- armada-xp-synology-ds414.dtb
++ armada-xp-synology-ds414.dtb \
++ onlinelabs-c1.dtb
+ dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \
+ dove-cubox.dtb \
+ dove-cubox-es.dtb \
+--
+1.9.3
+
diff --git a/0003-enable-hardware-I-O-coherency.patch b/0003-enable-hardware-I-O-coherency.patch
new file mode 100644
index 00000000..fe9b6f6a
--- /dev/null
+++ b/0003-enable-hardware-I-O-coherency.patch
@@ -0,0 +1,32 @@
+From bbce428becdc218292d61b846dab7c8a8a0d4994 Mon Sep 17 00:00:00 2001
+From: Manfred Touron <m@42.am>
+Date: Thu, 5 Feb 2015 17:54:52 +0000
+Subject: [PATCH 3/3] enable hardware I/O coherency
+
+---
+ arch/arm/mach-mvebu/coherency.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
+index ccef880..3a7777e 100644
+--- a/arch/arm/mach-mvebu/coherency.c
++++ b/arch/arm/mach-mvebu/coherency.c
+@@ -254,13 +254,11 @@ static int coherency_type(void)
+ }
+
+ /*
+- * As a precaution, we currently completely disable hardware I/O
+- * coherency, until enough testing is done with automatic I/O
+- * synchronization barriers to validate that it is a proper solution.
++ * Re-enabling hardware I/O coherency.
+ */
+ int coherency_available(void)
+ {
+- return false;
++ return true;
+ }
+
+ int __init coherency_init(void)
+--
+1.9.3
+