Re: [PATCH 0/2] clk: fixed-factor: add DT init function

2014-04-26 Thread Sascha Hauer
On Fri, Apr 25, 2014 at 11:57:45AM +0400, Antony Pavlov wrote:
 This short patchseries imports DT init function for fixed-factor clocks
 from linux kernel.
 
 Antony Pavlov (2):
   clk: move of_clk_get_parent_name() to common clk code
   clk: fixed-factor: add DT init function

Applied, thanks

Sascha

 
  drivers/clk/clk-fixed-factor.c | 36 
  drivers/clk/clk.c  | 20 
  drivers/clk/socfpga.c  | 19 ---
  include/linux/clk.h|  1 +
  4 files changed, 57 insertions(+), 19 deletions(-)
 
 -- 
 1.9.0
 
 
 ___
 barebox mailing list
 barebox@lists.infradead.org
 http://lists.infradead.org/mailman/listinfo/barebox
 

-- 
Pengutronix e.K.   | |
Industrial Linux Solutions | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686   | Fax:   +49-5121-206917- |

___
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox


[PATCH 2/2] commands/umount: Return real error code if umount fail

2014-04-26 Thread Alexander Shiyan
Signed-off-by: Alexander Shiyan shc_w...@mail.ru
---
 commands/umount.c | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/commands/umount.c b/commands/umount.c
index e6de1bc..f0f9fce 100644
--- a/commands/umount.c
+++ b/commands/umount.c
@@ -23,16 +23,10 @@
 
 static int do_umount(int argc, char *argv[])
 {
-   int ret = 0;
-
if (argc != 2)
return COMMAND_ERROR_USAGE;
 
-   if ((ret = umount(argv[1]))) {
-   perror(umount);
-   return 1;
-   }
-   return 0;
+   return umount(argv[1]);
 }
 
 static const __maybe_unused char cmd_umount_help[] =
-- 
1.8.3.2


___
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox


[PATCH 1/2] commands/mount: Return real error code if mount fail

2014-04-26 Thread Alexander Shiyan
Signed-off-by: Alexander Shiyan shc_w...@mail.ru
---
 commands/mount.c | 9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/commands/mount.c b/commands/mount.c
index 691bc29..8629bac 100644
--- a/commands/mount.c
+++ b/commands/mount.c
@@ -31,8 +31,7 @@
 
 static int do_mount(int argc, char *argv[])
 {
-   int opt;
-   int ret = 0, verbose = 0;
+   int opt, verbose = 0;
struct driver_d *drv;
const char *type = NULL;
const char *mountpoint, *dev;
@@ -113,11 +112,7 @@ static int do_mount(int argc, char *argv[])
mountpoint = argv[optind + 1];
}
 
-   if ((ret = mount(dev, type, mountpoint, fsoptions))) {
-   perror(mount);
-   return 1;
-   }
-   return 0;
+   return mount(dev, type, mountpoint, fsoptions);
 }
 
 BAREBOX_CMD_HELP_START(mount)
-- 
1.8.3.2


___
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox


Re: [PATCH 1/4] imx6:mmdc: Move register defines to header file

2014-04-26 Thread Alexander Aring
On Fri, Apr 25, 2014 at 02:54:41PM +0200, Alexander Aring wrote:
 Hi,
 
 On Fri, Apr 25, 2014 at 01:54:25PM +0200, Christian Hemp wrote:
  Move mmdc register defines to mmdc header file.
  
  Signed-off-by: Christian Hemp c.h...@phytec.de
  ---
   arch/arm/mach-imx/imx6-mmdc.c  |   37 
  --
   arch/arm/mach-imx/include/mach/imx6-mmdc.h |   39 
  
   2 files changed, 39 insertions(+), 37 deletions(-)
  
  diff --git a/arch/arm/mach-imx/imx6-mmdc.c b/arch/arm/mach-imx/imx6-mmdc.c
  index d1de593..9686bee 100644
  --- a/arch/arm/mach-imx/imx6-mmdc.c
  +++ b/arch/arm/mach-imx/imx6-mmdc.c
  @@ -20,43 +20,6 @@
   #include mach/imx6-regs.h
   #include mach/imx6-mmdc.h
   
  -#define P0_IPS (void __iomem *)MX6_MMDC_P0_BASE_ADDR
  -#define P1_IPS (void __iomem *)MX6_MMDC_P1_BASE_ADDR
  -
  -#define MDCTL  0x000
  -#define MDPDC  0x004
  -#define MDSCR  0x01c
  -#define MDMISC 0x018
  -#define MDREF  0x020
  -#define MAPSR  0x404
  -#define MPZQHWCTRL 0x800
  -#define MPWLGCR0x808
  -#define MPWLDECTRL00x80c
  -#define MPWLDECTRL10x810
  -#define MPPDCMPR1  0x88c
  -#define MPSWDAR0x894
  -#define MPRDDLCTL  0x848
  -#define MPMUR  0x8b8
  -#define MPDGCTRL0  0x83c
  -#define MPDGCTRL1  0x840
  -#define MPRDDLCTL  0x848
  -#define MPWRDLCTL  0x850
  -#define MPRDDLHWCTL0x860
  -#define MPWRDLHWCTL0x864
  -#define MPDGHWST0  0x87c
  -#define MPDGHWST1  0x880
  -#define MPDGHWST2  0x884
  -#define MPDGHWST3  0x888
  -
  -#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS0   ((void __iomem 
  *)MX6_IOMUXC_BASE_ADDR + 0x5a8)
  -#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS1   ((void __iomem 
  *)MX6_IOMUXC_BASE_ADDR + 0x5b0)
  -#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS2   ((void __iomem 
  *)MX6_IOMUXC_BASE_ADDR + 0x524)
  -#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS3   ((void __iomem 
  *)MX6_IOMUXC_BASE_ADDR + 0x51c)
  -#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS4   ((void __iomem 
  *)MX6_IOMUXC_BASE_ADDR + 0x518)
  -#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS5   ((void __iomem 
  *)MX6_IOMUXC_BASE_ADDR + 0x50c)
  -#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS6   ((void __iomem 
  *)MX6_IOMUXC_BASE_ADDR + 0x5b8)
  -#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS7   ((void __iomem 
  *)MX6_IOMUXC_BASE_ADDR + 0x5c0)
  -
 
 are you sure that it doesn't fix the build after applying this patch? I
 think you need to add a include of the imx6-mmdc.h header file...
 
yea, I see now the #include mach/imx6-mmdc.h so this works.

   int mmdc_do_write_level_calibration(void)
   {
  u32 esdmisc_val, zq_val;
  diff --git a/arch/arm/mach-imx/include/mach/imx6-mmdc.h 
  b/arch/arm/mach-imx/include/mach/imx6-mmdc.h
  index 4ad939e..3152e16 100644
  --- a/arch/arm/mach-imx/include/mach/imx6-mmdc.h
  +++ b/arch/arm/mach-imx/include/mach/imx6-mmdc.h
  @@ -1,6 +1,45 @@
   #ifndef __MACH_MMDC_H
   #define __MACH_MMDC_H
  
 
 You should also include the headers which are necessary for the
 following define like MX6_MMDC_P0_BASE_ADDR which are defined in 
 mach/imx6-regs.h and for all others...
 

but this you should really do.

- Alex

___
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox