subject:"\[U\-Boot\] \[PATCH\] ARC\: HSDK\: add platform\-specific commands"

Re: [U-Boot] [PATCH] ARC: HSDK: add platform-specific commands

2018-03-22 Thread Alexey Brodkin

Hi Eugeniy,

To start from your patch doesn't apply on u-boot-arc/next:
-->8-
git am \[PATCH\]_ARC\:_HSDK\:_add_platform-specific_commands.mbox
Applying: ARC: HSDK: add platform-specific commands
/home/abrodkin/Projects/sources/git/u-boot/.git/worktrees/tmp-mainline-test/rebase-apply/patch:868:
 space before tab in indent.
: /* no output */
error: patch failed: board/synopsys/hsdk/hsdk.c:1
error: board/synopsys/hsdk/hsdk.c: patch does not apply
Patch failed at 0001 ARC: HSDK: add platform-specific commands
The copy of the patch that failed is found in: 
/home/abrodkin/Projects/sources/git/u-boot/.git/worktrees/tmp-mainline-test/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
# git am --abort 
# git s
On branch staging-arc
Your branch is up-to-date with 'u-boot-arc/next'.

Untracked files:
  (use "git add ..." to include in what will be committed)

[PATCH]_ARC:_HSDK:_add_platform-specific_commands.mbox

nothing added to commit but untracked files present (use "git add" to track)
-->8-

I had to apply it manually, remove stuff related to hsdk.c and rm hsdk.c.
Care to check what's wrong there.
Also patch complained a lot on trailing CRs:
-->8-
(Stripping trailing CRs from patch; use --binary to disable.)
patching file arch/arc/dts/hsdk.dts
(Stripping trailing CRs from patch; use --binary to disable.)
patching file board/synopsys/hsdk/MAINTAINERS
(Stripping trailing CRs from patch; use --binary to disable.)
patching file board/synopsys/hsdk/Makefile
(Stripping trailing CRs from patch; use --binary to disable.)
patching file board/synopsys/hsdk/clk-lib.c
(Stripping trailing CRs from patch; use --binary to disable.)
patching file board/synopsys/hsdk/clk-lib.h
(Stripping trailing CRs from patch; use --binary to disable.)
patching file board/synopsys/hsdk/env-lib.c
(Stripping trailing CRs from patch; use --binary to disable.)
patching file board/synopsys/hsdk/env-lib.h
(Stripping trailing CRs from patch; use --binary to disable.)
patching file board/synopsys/hsdk/hsdk-cmd.c
(Stripping trailing CRs from patch; use --binary to disable.)
-->8-

Also there're obvious extra spaces, did you run checkpatch?
I guess no:
-->8-
total: 5 errors, 65 warnings, 11 checks, 1619 lines checked
-->8-

On Wed, 2018-03-21 at 21:46 +0300, Eugeniy Paltsev wrote:
> Signed-off-by: Eugeniy Paltsev 
> ---
>  arch/arc/dts/hsdk.dts   |  56 +++
>  board/synopsys/hsdk/MAINTAINERS |   6 +-
>  board/synopsys/hsdk/Makefile|   4 +-
>  board/synopsys/hsdk/clk-lib.c   |  68 +++
>  board/synopsys/hsdk/clk-lib.h   |  17 +
>  board/synopsys/hsdk/env-lib.c   | 295 
>  board/synopsys/hsdk/env-lib.h   |  51 ++
>  board/synopsys/hsdk/hsdk-cmd.c  | 995 
> 
>  board/synopsys/hsdk/hsdk.c  |  95 
>  configs/hsdk_defconfig  |  15 +
>  include/configs/hsdk.h  |  38 +-
>  11 files changed, 1538 insertions(+), 102 deletions(-)
>  create mode 100644 board/synopsys/hsdk/clk-lib.c
>  create mode 100644 board/synopsys/hsdk/clk-lib.h
>  create mode 100644 board/synopsys/hsdk/env-lib.c
>  create mode 100644 board/synopsys/hsdk/env-lib.h
>  create mode 100644 board/synopsys/hsdk/hsdk-cmd.c
>  delete mode 100644 board/synopsys/hsdk/hsdk.c
> 
> diff --git a/arch/arc/dts/hsdk.dts b/arch/arc/dts/hsdk.dts
> index 67dfb93ca8..d9151ed646 100644
> --- a/arch/arc/dts/hsdk.dts
> +++ b/arch/arc/dts/hsdk.dts
> @@ -6,6 +6,7 @@
>  /dts-v1/;
>  
>  #include "skeleton.dtsi"
> +#include "dt-bindings/clock/snps,hsdk-cgu.h"
>  
>  / {
>   #address-cells = <1>;
> @@ -13,6 +14,7 @@
>  
>   aliases {
>   console = 
> + spi0 = "/spi@f002";

Maybe spi0 = ?

...
spi0: spi@f002 {
...

>   };
>  
>   cpu_card {
> @@ -24,6 +26,35 @@
>   };
>   };
>  
> + clk-fmeas {
> + clocks = <_clk CLK_ARC_PLL>, <_clk CLK_SYS_PLL>,
> +  <_clk CLK_TUN_PLL>, <_clk CLK_DDR_PLL>,
> +  <_clk CLK_ARC>, <_clk CLK_HDMI_PLL>,
> +  <_clk CLK_TUN_TUN>, <_clk CLK_HDMI>,
> +  <_clk CLK_SYS_APB>, <_clk CLK_SYS_AXI>,
> +  <_clk CLK_SYS_ETH>, <_clk CLK_SYS_USB>,
> +  <_clk CLK_SYS_SDIO>, <_clk CLK_SYS_HDMI>,
> +  <_clk CLK_SYS_GFX_CORE>, <_clk 
> CLK_SYS_GFX_DMA>,
> +  <_clk CLK_SYS_GFX_CFG>, <_clk 
>

[U-Boot] [PATCH] ARC: HSDK: add platform-specific commands

2018-03-21 Thread Eugeniy Paltsev

Signed-off-by: Eugeniy Paltsev 
---
 arch/arc/dts/hsdk.dts   |  56 +++
 board/synopsys/hsdk/MAINTAINERS |   6 +-
 board/synopsys/hsdk/Makefile|   4 +-
 board/synopsys/hsdk/clk-lib.c   |  68 +++
 board/synopsys/hsdk/clk-lib.h   |  17 +
 board/synopsys/hsdk/env-lib.c   | 295 
 board/synopsys/hsdk/env-lib.h   |  51 ++
 board/synopsys/hsdk/hsdk-cmd.c  | 995 
 board/synopsys/hsdk/hsdk.c  |  95 
 configs/hsdk_defconfig  |  15 +
 include/configs/hsdk.h  |  38 +-
 11 files changed, 1538 insertions(+), 102 deletions(-)
 create mode 100644 board/synopsys/hsdk/clk-lib.c
 create mode 100644 board/synopsys/hsdk/clk-lib.h
 create mode 100644 board/synopsys/hsdk/env-lib.c
 create mode 100644 board/synopsys/hsdk/env-lib.h
 create mode 100644 board/synopsys/hsdk/hsdk-cmd.c
 delete mode 100644 board/synopsys/hsdk/hsdk.c

diff --git a/arch/arc/dts/hsdk.dts b/arch/arc/dts/hsdk.dts
index 67dfb93ca8..d9151ed646 100644
--- a/arch/arc/dts/hsdk.dts
+++ b/arch/arc/dts/hsdk.dts
@@ -6,6 +6,7 @@
 /dts-v1/;
 
 #include "skeleton.dtsi"
+#include "dt-bindings/clock/snps,hsdk-cgu.h"
 
 / {
#address-cells = <1>;
@@ -13,6 +14,7 @@
 
aliases {
console = 
+   spi0 = "/spi@f002";
};
 
cpu_card {
@@ -24,6 +26,35 @@
};
};
 
+   clk-fmeas {
+   clocks = <_clk CLK_ARC_PLL>, <_clk CLK_SYS_PLL>,
+<_clk CLK_TUN_PLL>, <_clk CLK_DDR_PLL>,
+<_clk CLK_ARC>, <_clk CLK_HDMI_PLL>,
+<_clk CLK_TUN_TUN>, <_clk CLK_HDMI>,
+<_clk CLK_SYS_APB>, <_clk CLK_SYS_AXI>,
+<_clk CLK_SYS_ETH>, <_clk CLK_SYS_USB>,
+<_clk CLK_SYS_SDIO>, <_clk CLK_SYS_HDMI>,
+<_clk CLK_SYS_GFX_CORE>, <_clk 
CLK_SYS_GFX_DMA>,
+<_clk CLK_SYS_GFX_CFG>, <_clk 
CLK_SYS_DMAC_CORE>,
+<_clk CLK_SYS_DMAC_CFG>, <_clk 
CLK_SYS_SDIO_REF>,
+<_clk CLK_SYS_SPI_REF>, <_clk CLK_SYS_I2C_REF>,
+<_clk CLK_SYS_UART_REF>, <_clk 
CLK_SYS_EBI_REF>,
+<_clk CLK_TUN_ROM>, <_clk CLK_TUN_PWM>;
+   clock-names = "cpu-pll", "sys-pll",
+ "tun-pll", "ddr-clk",
+ "cpu-clk", "hdmi-pll",
+ "tun-clk", "hdmi-clk",
+ "apb-clk", "axi-clk",
+ "eth-clk", "usb-clk",
+ "sdio-clk", "hdmi-sys-clk",
+ "gfx-core-clk", "gfx-dma-clk",
+ "gfx-cfg-clk", "dmac-core-clk",
+ "dmac-cfg-clk", "sdio-ref-clk",
+ "spi-clk", "i2c-clk",
+ "uart-clk", "ebi-clk",
+ "rom-clk", "pwm-clk";
+   };
+
cgu_clk: cgu-clk@f000 {
compatible = "snps,hsdk-cgu-clock";
reg = <0xf000 0x10>, <0xf00014B8 0x4>;
@@ -53,4 +84,29 @@
compatible = "generic-ohci";
reg = <0xf006 0x100>;
};
+
+   spi@f002 {
+   compatible = "snps,dw-apb-ssi";
+   reg = <0xf002 0x1000>;
+   #address-cells = <1>;
+   #size-cells = <0>;
+   spi-max-frequency = <400>;
+   clocks = <_clk CLK_SYS_SPI_REF>;
+   clock-names = "spi_clk";
+   cs-gpio = <_gpio 0>;
+   spi_flash@0 {
+   compatible = "spi-flash";
+   reg = <0>;
+   spi-max-frequency = <400>;
+   };
+   };
+
+   cs_gpio: gpio@f00114B0 {
+   compatible = "snps,hsdk-creg-gpio";
+   reg = <0xf00014B0 0x4>;
+   gpio-controller;
+   #gpio-cells = <1>;
+   gpio-bank-name = "hsdk-spi-cs";
+   gpio-count = <1>;
+   };
 };
diff --git a/board/synopsys/hsdk/MAINTAINERS b/board/synopsys/hsdk/MAINTAINERS
index d034bc479d..8c02f52976 100644
--- a/board/synopsys/hsdk/MAINTAINERS
+++ b/board/synopsys/hsdk/MAINTAINERS
@@ -1,5 +1,5 @@
-AXS10X BOARD
-M: Alexey Brodkin 
+HSDK BOARD
+M: Eugeniy Paltsev 
 S: Maintained
-F: board/synopsys/hsdk/
+F: board/synopsys/hsdk-cmd/
 F: configs/hsdk_defconfig
diff --git a/board/synopsys/hsdk/Makefile b/board/synopsys/hsdk/Makefile
index d84dd03265..390e429557 100644
--- a/board/synopsys/hsdk/Makefile
+++ b/board/synopsys/hsdk/Makefile
@@ -4,4 +4,6 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
 
-obj-y  += hsdk.o
+obj-y  += hsdk-cmd.o
+obj-y  += env-lib.o
+obj-y  += clk-lib.o
diff --git a/board/synopsys/hsdk/clk-lib.c

Re: [U-Boot] [PATCH] ARC: HSDK: add platform-specific commands

[U-Boot] [PATCH] ARC: HSDK: add platform-specific commands

2 matches

Site Navigation

Mail list logo

Footer information