From 198191b3823bd3145b2f49cc19b0290866ba7c46 Mon Sep 17 00:00:00 2001
From: Shaun Mulligan <shaun@resin.io>
Date: Fri, 16 Jun 2017 15:25:15 +0200
Subject: [PATCH] additional u-boot patches from armbian and support for led
 blinking

---
 .../u-boot/u-boot/h3-enable-power-led.patch   | 16 +++++++
 .../h3-set-safe-axi_apb-clock-dividers.patch  | 42 +++++++++++++++++++
 .../docker-resin-supervisor-disk.bbappend     |  1 +
 3 files changed, 59 insertions(+)
 create mode 100644 layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot/h3-enable-power-led.patch
 create mode 100644 layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot/h3-set-safe-axi_apb-clock-dividers.patch
 create mode 100644 layers/meta-resin-allwinner/recipes-containers/docker-disk/docker-resin-supervisor-disk.bbappend

diff --git a/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot/h3-enable-power-led.patch b/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot/h3-enable-power-led.patch
new file mode 100644
index 0000000..8d2f57a
--- /dev/null
+++ b/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot/h3-enable-power-led.patch
@@ -0,0 +1,16 @@
+diff --git a/board/sunxi/board.c b/board/sunxi/board.c
+index 3cf3614..89cf7f5 100644
+--- a/board/sunxi/board.c
++++ b/board/sunxi/board.c
+@@ -478,6 +478,11 @@ void sunxi_board_init(void)
+ 	int power_failed = 0;
+ 	unsigned long ramsize;
+ 
++#ifdef CONFIG_MACH_SUN8I_H3
++	/* turn on power LED (PL10) on H3 boards */
++	gpio_direction_output(SUNXI_GPL(10), 1);
++#endif
++
+ #ifdef CONFIG_SY8106A_POWER
+ 	power_failed = sy8106a_set_vout1(CONFIG_SY8106A_VOUT1_VOLT);
+ #endif
diff --git a/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot/h3-set-safe-axi_apb-clock-dividers.patch b/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot/h3-set-safe-axi_apb-clock-dividers.patch
new file mode 100644
index 0000000..3bc789a
--- /dev/null
+++ b/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot/h3-set-safe-axi_apb-clock-dividers.patch
@@ -0,0 +1,42 @@
+diff --git a/arch/arm/mach-sunxi/clock_sun6i.c b/arch/arm/mach-sunxi/clock_sun6i.c
+index 15272c9..cedddc2 100644
+--- a/arch/arm/mach-sunxi/clock_sun6i.c
++++ b/arch/arm/mach-sunxi/clock_sun6i.c
+@@ -117,8 +117,8 @@ void clock_set_pll1(unsigned int clk)
+ 	sdelay(200);
+ 
+ 	/* Switch CPU to PLL1 */
+-	writel(AXI_DIV_3 << AXI_DIV_SHIFT |
+-	       ATB_DIV_2 << ATB_DIV_SHIFT |
++	writel(AXI_DIV_4 << AXI_DIV_SHIFT |
++	       ATB_DIV_4 << ATB_DIV_SHIFT |
+ 	       CPU_CLK_SRC_PLL1 << CPU_CLK_SRC_SHIFT,
+ 	       &ccm->cpu_axi_cfg);
+ }
+diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h
+index f2990db..b3a8575 100644
+--- a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h
++++ b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h
+@@ -180,6 +180,7 @@ struct sunxi_ccm_reg {
+ #define CCM_PLL1_CTRL_N(n)		((((n) - 1) & 0x1f) << 8)
+ #define CCM_PLL1_CTRL_P(n)		(((n) & 0x3) << 16)
+ #define CCM_PLL1_CTRL_EN		(0x1 << 31)
++#define CCM_PLL1_CTRL_LOCK		(0x1 << 28)
+ 
+ #define CCM_PLL3_CTRL_M_SHIFT		0
+ #define CCM_PLL3_CTRL_M_MASK		(0xf << CCM_PLL3_CTRL_M_SHIFT)
+diff --git a/arch/arm/mach-sunxi/clock_sun6i.c b/arch/arm/mach-sunxi/clock_sun6i.c
+index cedddc2..3fe9305 100644
+--- a/arch/arm/mach-sunxi/clock_sun6i.c
++++ b/arch/arm/mach-sunxi/clock_sun6i.c
+@@ -114,7 +114,9 @@ void clock_set_pll1(unsigned int clk)
+ 	writel(CCM_PLL1_CTRL_EN | CCM_PLL1_CTRL_P(p) |
+ 	       CCM_PLL1_CTRL_N(clk / (24000000 * k / m)) |
+ 	       CCM_PLL1_CTRL_K(k) | CCM_PLL1_CTRL_M(m), &ccm->pll1_cfg);
+-	sdelay(200);
++
++	while (!(readl(&ccm->pll1_cfg) & CCM_PLL1_CTRL_LOCK))
++		;
+ 
+ 	/* Switch CPU to PLL1 */
+ 	writel(AXI_DIV_4 << AXI_DIV_SHIFT |
\ No newline at end of file
diff --git a/layers/meta-resin-allwinner/recipes-containers/docker-disk/docker-resin-supervisor-disk.bbappend b/layers/meta-resin-allwinner/recipes-containers/docker-disk/docker-resin-supervisor-disk.bbappend
new file mode 100644
index 0000000..8068ea6
--- /dev/null
+++ b/layers/meta-resin-allwinner/recipes-containers/docker-disk/docker-resin-supervisor-disk.bbappend
@@ -0,0 +1 @@
+LED_FILE_orange-pi-lite = "/sys/devices/platform/leds/leds/orangepi\:red\:status/brightness"