sunxi: Backport patches needed for A64

This backports multiple patches from kernel 4.10 which are adding
missing support for the A64 and the pine64 board. These are the device
tree files, the pinctlk and the clock driver.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

1 files changed, 182 insertions, 0 deletions

diff --git a/target/linux/sunxi/patches-4.9/0004-clk-sunxi-ng-Finish-to-convert-to-structures-for-arg.patch b/target/linux/sunxi/patches-4.9/0004-clk-sunxi-ng-Finish-to-convert-to-structures-for-arg.patch
new file mode 100644
index 0000000000..4b91892b81
--- /dev/null
+++ b/target/linux/sunxi/patches-4.9/0004-clk-sunxi-ng-Finish-to-convert-to-structures-for-arg.patch
@@ -0,0 +1,182 @@
+From b8302c7267dedaeeb1bf38143f099defbf16dce8 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Thu, 29 Sep 2016 23:50:21 +0200
+Subject: clk: sunxi-ng: Finish to convert to structures for arguments
+
+Some clocks still use an explicit list of arguments, which make it a bit
+more tedious to add new parameters.
+
+Convert those over to a structure pointer argument to add as many
+arguments as possible without having to many noise in our patches, or a
+very long list of arguments.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+Acked-by: Chen-Yu Tsai <wens@csie.org>
+---
+ drivers/clk/sunxi-ng/ccu_mult.c | 28 ++++++++++++++++++++--------
+ drivers/clk/sunxi-ng/ccu_nk.c   | 39 ++++++++++++++++++++++-----------------
+ 2 files changed, 42 insertions(+), 25 deletions(-)
+
+--- a/drivers/clk/sunxi-ng/ccu_mult.c
++++ b/drivers/clk/sunxi-ng/ccu_mult.c
+@@ -13,10 +13,20 @@
+ #include "ccu_gate.h"
+ #include "ccu_mult.h"
+ 
++struct _ccu_mult {
++	unsigned long	mult, max;
++};
++
+ static void ccu_mult_find_best(unsigned long parent, unsigned long rate,
+-			       unsigned int max_n, unsigned int *n)
++			       struct _ccu_mult *mult)
+ {
+-	*n = rate / parent;
++	int _mult;
++
++	_mult = rate / parent;
++	if (_mult > mult->max)
++		_mult = mult->max;
++
++	mult->mult = _mult;
+ }
+ 
+ static unsigned long ccu_mult_round_rate(struct ccu_mux_internal *mux,
+@@ -25,11 +35,12 @@ static unsigned long ccu_mult_round_rate
+ 					void *data)
+ {
+ 	struct ccu_mult *cm = data;
+-	unsigned int n;
++	struct _ccu_mult _cm;
+ 
+-	ccu_mult_find_best(parent_rate, rate, 1 << cm->mult.width, &n);
++	_cm.max = 1 << cm->mult.width;
++	ccu_mult_find_best(parent_rate, rate, &_cm);
+ 
+-	return parent_rate * n;
++	return parent_rate * _cm.mult;
+ }
+ 
+ static void ccu_mult_disable(struct clk_hw *hw)
+@@ -83,21 +94,22 @@ static int ccu_mult_set_rate(struct clk_
+ 			   unsigned long parent_rate)
+ {
+ 	struct ccu_mult *cm = hw_to_ccu_mult(hw);
++	struct _ccu_mult _cm;
+ 	unsigned long flags;
+-	unsigned int n;
+ 	u32 reg;
+ 
+ 	ccu_mux_helper_adjust_parent_for_prediv(&cm->common, &cm->mux, -1,
+ 						&parent_rate);
+ 
+-	ccu_mult_find_best(parent_rate, rate, 1 << cm->mult.width, &n);
++	_cm.max = 1 << cm->mult.width;
++	ccu_mult_find_best(parent_rate, rate, &_cm);
+ 
+ 	spin_lock_irqsave(cm->common.lock, flags);
+ 
+ 	reg = readl(cm->common.base + cm->common.reg);
+ 	reg &= ~GENMASK(cm->mult.width + cm->mult.shift - 1, cm->mult.shift);
+ 
+-	writel(reg | ((n - 1) << cm->mult.shift),
++	writel(reg | ((_cm.mult - 1) << cm->mult.shift),
+ 	       cm->common.base + cm->common.reg);
+ 
+ 	spin_unlock_irqrestore(cm->common.lock, flags);
+--- a/drivers/clk/sunxi-ng/ccu_nk.c
++++ b/drivers/clk/sunxi-ng/ccu_nk.c
+@@ -9,21 +9,24 @@
+  */
+ 
+ #include <linux/clk-provider.h>
+-#include <linux/rational.h>
+ 
+ #include "ccu_gate.h"
+ #include "ccu_nk.h"
+ 
++struct _ccu_nk {
++	unsigned long	n, max_n;
++	unsigned long	k, max_k;
++};
++
+ static void ccu_nk_find_best(unsigned long parent, unsigned long rate,
+-			     unsigned int max_n, unsigned int max_k,
+-			     unsigned int *n, unsigned int *k)
++			     struct _ccu_nk *nk)
+ {
+ 	unsigned long best_rate = 0;
+ 	unsigned int best_k = 0, best_n = 0;
+ 	unsigned int _k, _n;
+ 
+-	for (_k = 1; _k <= max_k; _k++) {
+-		for (_n = 1; _n <= max_n; _n++) {
++	for (_k = 1; _k <= nk->max_k; _k++) {
++		for (_n = 1; _n <= nk->max_n; _n++) {
+ 			unsigned long tmp_rate = parent * _n * _k;
+ 
+ 			if (tmp_rate > rate)
+@@ -37,8 +40,8 @@ static void ccu_nk_find_best(unsigned lo
+ 		}
+ 	}
+ 
+-	*k = best_k;
+-	*n = best_n;
++	nk->k = best_k;
++	nk->n = best_n;
+ }
+ 
+ static void ccu_nk_disable(struct clk_hw *hw)
+@@ -89,16 +92,17 @@ static long ccu_nk_round_rate(struct clk
+ 			      unsigned long *parent_rate)
+ {
+ 	struct ccu_nk *nk = hw_to_ccu_nk(hw);
+-	unsigned int n, k;
++	struct _ccu_nk _nk;
+ 
+ 	if (nk->common.features & CCU_FEATURE_FIXED_POSTDIV)
+ 		rate *= nk->fixed_post_div;
+ 
+-	ccu_nk_find_best(*parent_rate, rate,
+-			 1 << nk->n.width, 1 << nk->k.width,
+-			 &n, &k);
++	_nk.max_n = 1 << nk->n.width;
++	_nk.max_k = 1 << nk->k.width;
++
++	ccu_nk_find_best(*parent_rate, rate, &_nk);
++	rate = *parent_rate * _nk.n * _nk.k;
+ 
+-	rate = *parent_rate * n * k;
+ 	if (nk->common.features & CCU_FEATURE_FIXED_POSTDIV)
+ 		rate = rate / nk->fixed_post_div;
+ 
+@@ -110,15 +114,16 @@ static int ccu_nk_set_rate(struct clk_hw
+ {
+ 	struct ccu_nk *nk = hw_to_ccu_nk(hw);
+ 	unsigned long flags;
+-	unsigned int n, k;
++	struct _ccu_nk _nk;
+ 	u32 reg;
+ 
+ 	if (nk->common.features & CCU_FEATURE_FIXED_POSTDIV)
+ 		rate = rate * nk->fixed_post_div;
+ 
+-	ccu_nk_find_best(parent_rate, rate,
+-			 1 << nk->n.width, 1 << nk->k.width,
+-			 &n, &k);
++	_nk.max_n = 1 << nk->n.width;
++	_nk.max_k = 1 << nk->k.width;
++
++	ccu_nk_find_best(parent_rate, rate, &_nk);
+ 
+ 	spin_lock_irqsave(nk->common.lock, flags);
+ 
+@@ -126,7 +131,7 @@ static int ccu_nk_set_rate(struct clk_hw
+ 	reg &= ~GENMASK(nk->n.width + nk->n.shift - 1, nk->n.shift);
+ 	reg &= ~GENMASK(nk->k.width + nk->k.shift - 1, nk->k.shift);
+ 
+-	writel(reg | ((k - 1) << nk->k.shift) | ((n - 1) << nk->n.shift),
++	writel(reg | ((_nk.k - 1) << nk->k.shift) | ((_nk.n - 1) << nk->n.shift),
+ 	       nk->common.base + nk->common.reg);
+ 
+ 	spin_unlock_irqrestore(nk->common.lock, flags);