mbox

[U-Boot] please pull u-boot-samsung master

Message ID 51BE7032.9010802@samsung.com
State Accepted
Delegated to: Albert ARIBAUD
Headers show

Pull-request

git://git.denx.de/u-boot-samsung master

Message

Minkyu Kang June 17, 2013, 2:10 a.m. UTC
Dear Albert,

The following changes since commit d0a51373131c4ba565a2391d5ed78b87c406ce98:

  at91sam9260ek: move board id setup to config header (2013-05-12 16:49:14 +0200)

are available in the git repository at:

  git://git.denx.de/u-boot-samsung master

for you to fetch changes up to ed7bdc03eb516fb698ccc12ec5b4b9f132d05c5f:

  MMC: DWMMC: Fix FIFO_DEPTH calculation (2013-06-17 11:03:42 +0900)

----------------------------------------------------------------
Akshay Saraswat (2):
      Exynos5: clock: Update the equation to calculate PLL output frequency
      Exynos: uart: s5p: enabling the uart tx/rx fifo

Amar (9):
      FDT: Add compatible string for DWMMC
      EXYNOS5: FDT: Add DWMMC device node data
      DWMMC: Initialise dwmci and resolve EMMC read write issues
      EXYNOS5: DWMMC: Added FDT support for DWMMC
      EXYNOS5: DWMMC: Initialise the local variable to avoid unwanted results.
      SMDK5250: Initialise and Enable DWMMC, support FDT and non-FDT
      MMC: APIs to support resize of EMMC boot partition
      SMDK5250: Enable EMMC booting
      COMMON: MMC: Command to support EMMC booting and to resize EMMC boot partition

Arkadiusz Wlodarczyk (1):
      arm:trats: change auto-booting to boot kernel with separate device tree blob

Inderpal Singh (3):
      exynos: move tzpc_init to armv7/exynos
      exynos: update tzpc to make it common for exynos4 and exynos5
      exynos: Update origen and smdkv310 to use common tzpc_init

Naveen Krishna Chatradhi (2):
      power: exynos-tmu: fix warnings and clean up code
      power: exynos-tmu: use the mux_addr bit fields in tmu_control register

Rajeshwari Shinde (3):
      SF: Add driver for Gigabyte device GD25LQ and GD25Q64B
      SMDK5250: Enable SPI Gigabyte device.
      MMC: DWMMC: Fix FIFO_DEPTH calculation

 arch/arm/cpu/armv7/exynos/Makefile                 |    2 +-
 arch/arm/cpu/armv7/exynos/clock.c                  |   10 +-
 .../arm/cpu/armv7/exynos/tzpc.c                    |   25 +-
 arch/arm/cpu/armv7/s5p-common/Makefile             |    2 +
 arch/arm/dts/exynos5250.dtsi                       |   33 ++
 arch/arm/include/asm/arch-exynos/cpu.h             |    4 +
 arch/arm/include/asm/arch-exynos/dwmmc.h           |   11 +-
 arch/arm/include/asm/arch-exynos/tmu.h             |   58 ++-
 arch/arm/include/asm/arch-exynos/tzpc.h            |   20 +
 board/samsung/dts/exynos5250-smdk5250.dts          |   24 ++
 board/samsung/origen/lowlevel_init.S               |   44 +-
 board/samsung/origen/origen_setup.h                |   25 --
 board/samsung/smdk5250/Makefile                    |    5 +-
 board/samsung/smdk5250/clock_init.c                |   18 +
 board/samsung/smdk5250/clock_init.h                |    5 +
 board/samsung/smdk5250/exynos5-dt.c                |  423 ++++++++++++++++++++
 board/samsung/smdk5250/lowlevel_init.S             |    2 +
 board/samsung/smdk5250/setup.h                     |   25 --
 board/samsung/smdk5250/smdk5250.c                  |  223 +++--------
 board/samsung/smdk5250/spl_boot.c                  |   64 ++-
 board/samsung/smdkv310/lowlevel_init.S             |   60 +--
 common/cmd_mmc.c                                   |  109 ++++-
 doc/device-tree-bindings/exynos/dwmmc.txt          |   54 +++
 drivers/mmc/dw_mmc.c                               |   27 +-
 drivers/mmc/exynos_dw_mmc.c                        |  127 +++++-
 drivers/mmc/mmc.c                                  |  134 +++++++
 drivers/mtd/spi/Makefile                           |    1 +
 drivers/mtd/spi/gigadevice.c                       |   81 ++++
 drivers/mtd/spi/spi_flash.c                        |    3 +
 drivers/mtd/spi/spi_flash_internal.h               |    1 +
 drivers/power/exynos-tmu.c                         |  123 +++---
 drivers/serial/serial_s5p.c                        |   13 +-
 drivers/video/exynos_fb.c                          |    4 +-
 include/configs/exynos5250-dt.h                    |   11 +-
 include/configs/origen.h                           |    2 +
 include/configs/smdkv310.h                         |    2 +
 include/configs/trats.h                            |   17 +-
 include/dwmmc.h                                    |    3 +
 include/fdtdec.h                                   |    1 +
 include/mmc.h                                      |   26 ++
 lib/fdtdec.c                                       |    1 +
 spl/Makefile                                       |    4 +
 42 files changed, 1356 insertions(+), 471 deletions(-)
 rename board/samsung/smdk5250/tzpc_init.c => arch/arm/cpu/armv7/exynos/tzpc.c (69%)
 create mode 100644 board/samsung/smdk5250/exynos5-dt.c
 create mode 100644 doc/device-tree-bindings/exynos/dwmmc.txt
 create mode 100644 drivers/mtd/spi/gigadevice.c

Comments

Jagan Teki June 17, 2013, 7:46 a.m. UTC | #1
On Mon, Jun 17, 2013 at 7:40 AM, Minkyu Kang <mk7.kang@samsung.com> wrote:
> Dear Albert,
>
> The following changes since commit d0a51373131c4ba565a2391d5ed78b87c406ce98:
>
>   at91sam9260ek: move board id setup to config header (2013-05-12 16:49:14 +0200)
>
> are available in the git repository at:
>
>   git://git.denx.de/u-boot-samsung master
>
> for you to fetch changes up to ed7bdc03eb516fb698ccc12ec5b4b9f132d05c5f:
>
>   MMC: DWMMC: Fix FIFO_DEPTH calculation (2013-06-17 11:03:42 +0900)
>
> ----------------------------------------------------------------
> Akshay Saraswat (2):
>       Exynos5: clock: Update the equation to calculate PLL output frequency
>       Exynos: uart: s5p: enabling the uart tx/rx fifo
>
> Amar (9):
>       FDT: Add compatible string for DWMMC
>       EXYNOS5: FDT: Add DWMMC device node data
>       DWMMC: Initialise dwmci and resolve EMMC read write issues
>       EXYNOS5: DWMMC: Added FDT support for DWMMC
>       EXYNOS5: DWMMC: Initialise the local variable to avoid unwanted results.
>       SMDK5250: Initialise and Enable DWMMC, support FDT and non-FDT
>       MMC: APIs to support resize of EMMC boot partition
>       SMDK5250: Enable EMMC booting
>       COMMON: MMC: Command to support EMMC booting and to resize EMMC boot partition
>
> Arkadiusz Wlodarczyk (1):
>       arm:trats: change auto-booting to boot kernel with separate device tree blob
>
> Inderpal Singh (3):
>       exynos: move tzpc_init to armv7/exynos
>       exynos: update tzpc to make it common for exynos4 and exynos5
>       exynos: Update origen and smdkv310 to use common tzpc_init
>
> Naveen Krishna Chatradhi (2):
>       power: exynos-tmu: fix warnings and clean up code
>       power: exynos-tmu: use the mux_addr bit fields in tmu_control register
>
> Rajeshwari Shinde (3):
>       SF: Add driver for Gigabyte device GD25LQ and GD25Q64B
>       SMDK5250: Enable SPI Gigabyte device.

SPI gigabyte flash driver is not available in drivers/mtd/spi/
Am i missing anything here, please help.

--
Thanks,
Jagan.

>       MMC: DWMMC: Fix FIFO_DEPTH calculation
>
>  arch/arm/cpu/armv7/exynos/Makefile                 |    2 +-
>  arch/arm/cpu/armv7/exynos/clock.c                  |   10 +-
>  .../arm/cpu/armv7/exynos/tzpc.c                    |   25 +-
>  arch/arm/cpu/armv7/s5p-common/Makefile             |    2 +
>  arch/arm/dts/exynos5250.dtsi                       |   33 ++
>  arch/arm/include/asm/arch-exynos/cpu.h             |    4 +
>  arch/arm/include/asm/arch-exynos/dwmmc.h           |   11 +-
>  arch/arm/include/asm/arch-exynos/tmu.h             |   58 ++-
>  arch/arm/include/asm/arch-exynos/tzpc.h            |   20 +
>  board/samsung/dts/exynos5250-smdk5250.dts          |   24 ++
>  board/samsung/origen/lowlevel_init.S               |   44 +-
>  board/samsung/origen/origen_setup.h                |   25 --
>  board/samsung/smdk5250/Makefile                    |    5 +-
>  board/samsung/smdk5250/clock_init.c                |   18 +
>  board/samsung/smdk5250/clock_init.h                |    5 +
>  board/samsung/smdk5250/exynos5-dt.c                |  423 ++++++++++++++++++++
>  board/samsung/smdk5250/lowlevel_init.S             |    2 +
>  board/samsung/smdk5250/setup.h                     |   25 --
>  board/samsung/smdk5250/smdk5250.c                  |  223 +++--------
>  board/samsung/smdk5250/spl_boot.c                  |   64 ++-
>  board/samsung/smdkv310/lowlevel_init.S             |   60 +--
>  common/cmd_mmc.c                                   |  109 ++++-
>  doc/device-tree-bindings/exynos/dwmmc.txt          |   54 +++
>  drivers/mmc/dw_mmc.c                               |   27 +-
>  drivers/mmc/exynos_dw_mmc.c                        |  127 +++++-
>  drivers/mmc/mmc.c                                  |  134 +++++++
>  drivers/mtd/spi/Makefile                           |    1 +
>  drivers/mtd/spi/gigadevice.c                       |   81 ++++
>  drivers/mtd/spi/spi_flash.c                        |    3 +
>  drivers/mtd/spi/spi_flash_internal.h               |    1 +
>  drivers/power/exynos-tmu.c                         |  123 +++---
>  drivers/serial/serial_s5p.c                        |   13 +-
>  drivers/video/exynos_fb.c                          |    4 +-
>  include/configs/exynos5250-dt.h                    |   11 +-
>  include/configs/origen.h                           |    2 +
>  include/configs/smdkv310.h                         |    2 +
>  include/configs/trats.h                            |   17 +-
>  include/dwmmc.h                                    |    3 +
>  include/fdtdec.h                                   |    1 +
>  include/mmc.h                                      |   26 ++
>  lib/fdtdec.c                                       |    1 +
>  spl/Makefile                                       |    4 +
>  42 files changed, 1356 insertions(+), 471 deletions(-)
>  rename board/samsung/smdk5250/tzpc_init.c => arch/arm/cpu/armv7/exynos/tzpc.c (69%)
>  create mode 100644 board/samsung/smdk5250/exynos5-dt.c
>  create mode 100644 doc/device-tree-bindings/exynos/dwmmc.txt
>  create mode 100644 drivers/mtd/spi/gigadevice.c
> --
> Thanks,
> Minkyu Kang.
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
Albert ARIBAUD June 18, 2013, 2:57 p.m. UTC | #2
Hi Minkyu,

On Mon, 17 Jun 2013 13:16:20 +0530, Jagan Teki
<jagannadh.teki@gmail.com> wrote:

> On Mon, Jun 17, 2013 at 7:40 AM, Minkyu Kang <mk7.kang@samsung.com> wrote:
> > Dear Albert,
> >
> > The following changes since commit d0a51373131c4ba565a2391d5ed78b87c406ce98:
> >
> >   at91sam9260ek: move board id setup to config header (2013-05-12 16:49:14 +0200)
> >
> > are available in the git repository at:
> >
> >   git://git.denx.de/u-boot-samsung master
> >
> > for you to fetch changes up to ed7bdc03eb516fb698ccc12ec5b4b9f132d05c5f:
> >
> >   MMC: DWMMC: Fix FIFO_DEPTH calculation (2013-06-17 11:03:42 +0900)
> >
> > ----------------------------------------------------------------
> > Akshay Saraswat (2):
> >       Exynos5: clock: Update the equation to calculate PLL output frequency
> >       Exynos: uart: s5p: enabling the uart tx/rx fifo
> >
> > Amar (9):
> >       FDT: Add compatible string for DWMMC
> >       EXYNOS5: FDT: Add DWMMC device node data
> >       DWMMC: Initialise dwmci and resolve EMMC read write issues
> >       EXYNOS5: DWMMC: Added FDT support for DWMMC
> >       EXYNOS5: DWMMC: Initialise the local variable to avoid unwanted results.
> >       SMDK5250: Initialise and Enable DWMMC, support FDT and non-FDT
> >       MMC: APIs to support resize of EMMC boot partition
> >       SMDK5250: Enable EMMC booting
> >       COMMON: MMC: Command to support EMMC booting and to resize EMMC boot partition
> >
> > Arkadiusz Wlodarczyk (1):
> >       arm:trats: change auto-booting to boot kernel with separate device tree blob
> >
> > Inderpal Singh (3):
> >       exynos: move tzpc_init to armv7/exynos
> >       exynos: update tzpc to make it common for exynos4 and exynos5
> >       exynos: Update origen and smdkv310 to use common tzpc_init
> >
> > Naveen Krishna Chatradhi (2):
> >       power: exynos-tmu: fix warnings and clean up code
> >       power: exynos-tmu: use the mux_addr bit fields in tmu_control register
> >
> > Rajeshwari Shinde (3):
> >       SF: Add driver for Gigabyte device GD25LQ and GD25Q64B
> >       SMDK5250: Enable SPI Gigabyte device.
> 
> SPI gigabyte flash driver is not available in drivers/mtd/spi/
> Am i missing anything here, please help.

So, Minkyu, should I pick this PR or wait for an update?

Amicalement,
Minkyu Kang June 19, 2013, 12:39 a.m. UTC | #3
On 18/06/13 23:57, Albert ARIBAUD wrote:
> Hi Minkyu,
> 
> On Mon, 17 Jun 2013 13:16:20 +0530, Jagan Teki
> <jagannadh.teki@gmail.com> wrote:
> 
>> On Mon, Jun 17, 2013 at 7:40 AM, Minkyu Kang <mk7.kang@samsung.com> wrote:
>>> Dear Albert,
>>>
>>> The following changes since commit d0a51373131c4ba565a2391d5ed78b87c406ce98:
>>>
>>>   at91sam9260ek: move board id setup to config header (2013-05-12 16:49:14 +0200)
>>>
>>> are available in the git repository at:
>>>
>>>   git://git.denx.de/u-boot-samsung master
>>>
>>> for you to fetch changes up to ed7bdc03eb516fb698ccc12ec5b4b9f132d05c5f:
>>>
>>>   MMC: DWMMC: Fix FIFO_DEPTH calculation (2013-06-17 11:03:42 +0900)
>>>
>>> ----------------------------------------------------------------
>>> Akshay Saraswat (2):
>>>       Exynos5: clock: Update the equation to calculate PLL output frequency
>>>       Exynos: uart: s5p: enabling the uart tx/rx fifo
>>>
>>> Amar (9):
>>>       FDT: Add compatible string for DWMMC
>>>       EXYNOS5: FDT: Add DWMMC device node data
>>>       DWMMC: Initialise dwmci and resolve EMMC read write issues
>>>       EXYNOS5: DWMMC: Added FDT support for DWMMC
>>>       EXYNOS5: DWMMC: Initialise the local variable to avoid unwanted results.
>>>       SMDK5250: Initialise and Enable DWMMC, support FDT and non-FDT
>>>       MMC: APIs to support resize of EMMC boot partition
>>>       SMDK5250: Enable EMMC booting
>>>       COMMON: MMC: Command to support EMMC booting and to resize EMMC boot partition
>>>
>>> Arkadiusz Wlodarczyk (1):
>>>       arm:trats: change auto-booting to boot kernel with separate device tree blob
>>>
>>> Inderpal Singh (3):
>>>       exynos: move tzpc_init to armv7/exynos
>>>       exynos: update tzpc to make it common for exynos4 and exynos5
>>>       exynos: Update origen and smdkv310 to use common tzpc_init
>>>
>>> Naveen Krishna Chatradhi (2):
>>>       power: exynos-tmu: fix warnings and clean up code
>>>       power: exynos-tmu: use the mux_addr bit fields in tmu_control register
>>>
>>> Rajeshwari Shinde (3):
>>>       SF: Add driver for Gigabyte device GD25LQ and GD25Q64B
>>>       SMDK5250: Enable SPI Gigabyte device.
>>
>> SPI gigabyte flash driver is not available in drivers/mtd/spi/
>> Am i missing anything here, please help.

gigabyte flash driver is available in drivers/mtd/spi/
please refer below link.
http://git.denx.de/?p=u-boot/u-boot-samsung.git;a=blob;f=drivers/mtd/spi/gigadevice.c;
> 
> So, Minkyu, should I pick this PR or wait for an update?

Please pick this PR.

> 
> Amicalement,
> 

Thanks,
Minkyu Kang.
Albert ARIBAUD June 19, 2013, 11:30 a.m. UTC | #4
Hi Minkyu,

On Mon, 17 Jun 2013 11:10:58 +0900, Minkyu Kang <mk7.kang@samsung.com>
wrote:

> Dear Albert,
> 
> The following changes since commit d0a51373131c4ba565a2391d5ed78b87c406ce98:
> 
>   at91sam9260ek: move board id setup to config header (2013-05-12 16:49:14 +0200)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-samsung master
> 
> for you to fetch changes up to ed7bdc03eb516fb698ccc12ec5b4b9f132d05c5f:
> 
>   MMC: DWMMC: Fix FIFO_DEPTH calculation (2013-06-17 11:03:42 +0900)

I had three merge conflicts here, two solved automatically (files
drivers/mmc/mmc.c and include/mmc.h) and one manually (spl/Makefile).

I have pushed the resulting branch as mastercandidate.

Please confirm that the resolutions are ok.

Amicalement,
Jagan Teki June 19, 2013, 11:49 a.m. UTC | #5
On Wed, Jun 19, 2013 at 6:09 AM, Minkyu Kang <mk7.kang@samsung.com> wrote:
> On 18/06/13 23:57, Albert ARIBAUD wrote:
>> Hi Minkyu,
>>
>> On Mon, 17 Jun 2013 13:16:20 +0530, Jagan Teki
>> <jagannadh.teki@gmail.com> wrote:
>>
>>> On Mon, Jun 17, 2013 at 7:40 AM, Minkyu Kang <mk7.kang@samsung.com> wrote:
>>>> Dear Albert,
>>>>
>>>> The following changes since commit d0a51373131c4ba565a2391d5ed78b87c406ce98:
>>>>
>>>>   at91sam9260ek: move board id setup to config header (2013-05-12 16:49:14 +0200)
>>>>
>>>> are available in the git repository at:
>>>>
>>>>   git://git.denx.de/u-boot-samsung master
>>>>
>>>> for you to fetch changes up to ed7bdc03eb516fb698ccc12ec5b4b9f132d05c5f:
>>>>
>>>>   MMC: DWMMC: Fix FIFO_DEPTH calculation (2013-06-17 11:03:42 +0900)
>>>>
>>>> ----------------------------------------------------------------
>>>> Akshay Saraswat (2):
>>>>       Exynos5: clock: Update the equation to calculate PLL output frequency
>>>>       Exynos: uart: s5p: enabling the uart tx/rx fifo
>>>>
>>>> Amar (9):
>>>>       FDT: Add compatible string for DWMMC
>>>>       EXYNOS5: FDT: Add DWMMC device node data
>>>>       DWMMC: Initialise dwmci and resolve EMMC read write issues
>>>>       EXYNOS5: DWMMC: Added FDT support for DWMMC
>>>>       EXYNOS5: DWMMC: Initialise the local variable to avoid unwanted results.
>>>>       SMDK5250: Initialise and Enable DWMMC, support FDT and non-FDT
>>>>       MMC: APIs to support resize of EMMC boot partition
>>>>       SMDK5250: Enable EMMC booting
>>>>       COMMON: MMC: Command to support EMMC booting and to resize EMMC boot partition
>>>>
>>>> Arkadiusz Wlodarczyk (1):
>>>>       arm:trats: change auto-booting to boot kernel with separate device tree blob
>>>>
>>>> Inderpal Singh (3):
>>>>       exynos: move tzpc_init to armv7/exynos
>>>>       exynos: update tzpc to make it common for exynos4 and exynos5
>>>>       exynos: Update origen and smdkv310 to use common tzpc_init
>>>>
>>>> Naveen Krishna Chatradhi (2):
>>>>       power: exynos-tmu: fix warnings and clean up code
>>>>       power: exynos-tmu: use the mux_addr bit fields in tmu_control register
>>>>
>>>> Rajeshwari Shinde (3):
>>>>       SF: Add driver for Gigabyte device GD25LQ and GD25Q64B
>>>>       SMDK5250: Enable SPI Gigabyte device.
>>>
>>> SPI gigabyte flash driver is not available in drivers/mtd/spi/
>>> Am i missing anything here, please help.
>
> gigabyte flash driver is available in drivers/mtd/spi/
> please refer below link.
> http://git.denx.de/?p=u-boot/u-boot-samsung.git;a=blob;f=drivers/mtd/spi/gigadevice.c;

My question is the driver is not yet in main line, but patch
" SMDK5250: Enable SPI Gigabyte device."
is enabling the driver CONFIG_* into smdk5250 configuration entries.

Is this valid, please correct me if am wrong.

--
Thanks,
Jagan.

>>
>> So, Minkyu, should I pick this PR or wait for an update?
>
> Please pick this PR.
>
>>
>> Amicalement,
>>
>
> Thanks,
> Minkyu Kang.
Albert ARIBAUD June 19, 2013, 11:54 a.m. UTC | #6
Hi Jagan,

On Wed, 19 Jun 2013 17:19:36 +0530, Jagan Teki
<jagannadh.teki@gmail.com> wrote:

> On Wed, Jun 19, 2013 at 6:09 AM, Minkyu Kang <mk7.kang@samsung.com> wrote:
> > On 18/06/13 23:57, Albert ARIBAUD wrote:
> >> Hi Minkyu,
> >>
> >> On Mon, 17 Jun 2013 13:16:20 +0530, Jagan Teki
> >> <jagannadh.teki@gmail.com> wrote:
> >>
> >>> On Mon, Jun 17, 2013 at 7:40 AM, Minkyu Kang <mk7.kang@samsung.com> wrote:
> >>>> Dear Albert,
> >>>>
> >>>> The following changes since commit d0a51373131c4ba565a2391d5ed78b87c406ce98:
> >>>>
> >>>>   at91sam9260ek: move board id setup to config header (2013-05-12 16:49:14 +0200)
> >>>>
> >>>> are available in the git repository at:
> >>>>
> >>>>   git://git.denx.de/u-boot-samsung master
> >>>>
> >>>> for you to fetch changes up to ed7bdc03eb516fb698ccc12ec5b4b9f132d05c5f:
> >>>>
> >>>>   MMC: DWMMC: Fix FIFO_DEPTH calculation (2013-06-17 11:03:42 +0900)
> >>>>
> >>>> ----------------------------------------------------------------
> >>>> Akshay Saraswat (2):
> >>>>       Exynos5: clock: Update the equation to calculate PLL output frequency
> >>>>       Exynos: uart: s5p: enabling the uart tx/rx fifo
> >>>>
> >>>> Amar (9):
> >>>>       FDT: Add compatible string for DWMMC
> >>>>       EXYNOS5: FDT: Add DWMMC device node data
> >>>>       DWMMC: Initialise dwmci and resolve EMMC read write issues
> >>>>       EXYNOS5: DWMMC: Added FDT support for DWMMC
> >>>>       EXYNOS5: DWMMC: Initialise the local variable to avoid unwanted results.
> >>>>       SMDK5250: Initialise and Enable DWMMC, support FDT and non-FDT
> >>>>       MMC: APIs to support resize of EMMC boot partition
> >>>>       SMDK5250: Enable EMMC booting
> >>>>       COMMON: MMC: Command to support EMMC booting and to resize EMMC boot partition
> >>>>
> >>>> Arkadiusz Wlodarczyk (1):
> >>>>       arm:trats: change auto-booting to boot kernel with separate device tree blob
> >>>>
> >>>> Inderpal Singh (3):
> >>>>       exynos: move tzpc_init to armv7/exynos
> >>>>       exynos: update tzpc to make it common for exynos4 and exynos5
> >>>>       exynos: Update origen and smdkv310 to use common tzpc_init
> >>>>
> >>>> Naveen Krishna Chatradhi (2):
> >>>>       power: exynos-tmu: fix warnings and clean up code
> >>>>       power: exynos-tmu: use the mux_addr bit fields in tmu_control register
> >>>>
> >>>> Rajeshwari Shinde (3):
> >>>>       SF: Add driver for Gigabyte device GD25LQ and GD25Q64B
> >>>>       SMDK5250: Enable SPI Gigabyte device.
> >>>
> >>> SPI gigabyte flash driver is not available in drivers/mtd/spi/
> >>> Am i missing anything here, please help.
> >
> > gigabyte flash driver is available in drivers/mtd/spi/
> > please refer below link.
> > http://git.denx.de/?p=u-boot/u-boot-samsung.git;a=blob;f=drivers/mtd/spi/gigadevice.c;
> 
> My question is the driver is not yet in main line, but patch
> " SMDK5250: Enable SPI Gigabyte device."
> is enabling the driver CONFIG_* into smdk5250 configuration entries.
> 
> Is this valid, please correct me if am wrong.

Doesn't patch "SMDK5250: Enable SPI Gigabyte device" immediately follow
patch "SF: Add driver for Gigabyte device GD25LQ and GD25Q64B" which
creates said device?

> --
> Thanks,
> Jagan.

Amicalement,
Jagan Teki June 19, 2013, 12:07 p.m. UTC | #7
On Wed, Jun 19, 2013 at 5:24 PM, Albert ARIBAUD
<albert.u.boot@aribaud.net> wrote:
> Hi Jagan,
>
> On Wed, 19 Jun 2013 17:19:36 +0530, Jagan Teki
> <jagannadh.teki@gmail.com> wrote:
>
>> On Wed, Jun 19, 2013 at 6:09 AM, Minkyu Kang <mk7.kang@samsung.com> wrote:
>> > On 18/06/13 23:57, Albert ARIBAUD wrote:
>> >> Hi Minkyu,
>> >>
>> >> On Mon, 17 Jun 2013 13:16:20 +0530, Jagan Teki
>> >> <jagannadh.teki@gmail.com> wrote:
>> >>
>> >>> On Mon, Jun 17, 2013 at 7:40 AM, Minkyu Kang <mk7.kang@samsung.com> wrote:
>> >>>> Dear Albert,
>> >>>>
>> >>>> The following changes since commit d0a51373131c4ba565a2391d5ed78b87c406ce98:
>> >>>>
>> >>>>   at91sam9260ek: move board id setup to config header (2013-05-12 16:49:14 +0200)
>> >>>>
>> >>>> are available in the git repository at:
>> >>>>
>> >>>>   git://git.denx.de/u-boot-samsung master
>> >>>>
>> >>>> for you to fetch changes up to ed7bdc03eb516fb698ccc12ec5b4b9f132d05c5f:
>> >>>>
>> >>>>   MMC: DWMMC: Fix FIFO_DEPTH calculation (2013-06-17 11:03:42 +0900)
>> >>>>
>> >>>> ----------------------------------------------------------------
>> >>>> Akshay Saraswat (2):
>> >>>>       Exynos5: clock: Update the equation to calculate PLL output frequency
>> >>>>       Exynos: uart: s5p: enabling the uart tx/rx fifo
>> >>>>
>> >>>> Amar (9):
>> >>>>       FDT: Add compatible string for DWMMC
>> >>>>       EXYNOS5: FDT: Add DWMMC device node data
>> >>>>       DWMMC: Initialise dwmci and resolve EMMC read write issues
>> >>>>       EXYNOS5: DWMMC: Added FDT support for DWMMC
>> >>>>       EXYNOS5: DWMMC: Initialise the local variable to avoid unwanted results.
>> >>>>       SMDK5250: Initialise and Enable DWMMC, support FDT and non-FDT
>> >>>>       MMC: APIs to support resize of EMMC boot partition
>> >>>>       SMDK5250: Enable EMMC booting
>> >>>>       COMMON: MMC: Command to support EMMC booting and to resize EMMC boot partition
>> >>>>
>> >>>> Arkadiusz Wlodarczyk (1):
>> >>>>       arm:trats: change auto-booting to boot kernel with separate device tree blob
>> >>>>
>> >>>> Inderpal Singh (3):
>> >>>>       exynos: move tzpc_init to armv7/exynos
>> >>>>       exynos: update tzpc to make it common for exynos4 and exynos5
>> >>>>       exynos: Update origen and smdkv310 to use common tzpc_init
>> >>>>
>> >>>> Naveen Krishna Chatradhi (2):
>> >>>>       power: exynos-tmu: fix warnings and clean up code
>> >>>>       power: exynos-tmu: use the mux_addr bit fields in tmu_control register
>> >>>>
>> >>>> Rajeshwari Shinde (3):
>> >>>>       SF: Add driver for Gigabyte device GD25LQ and GD25Q64B
>> >>>>       SMDK5250: Enable SPI Gigabyte device.
>> >>>
>> >>> SPI gigabyte flash driver is not available in drivers/mtd/spi/
>> >>> Am i missing anything here, please help.
>> >
>> > gigabyte flash driver is available in drivers/mtd/spi/
>> > please refer below link.
>> > http://git.denx.de/?p=u-boot/u-boot-samsung.git;a=blob;f=drivers/mtd/spi/gigadevice.c;
>>
>> My question is the driver is not yet in main line, but patch
>> " SMDK5250: Enable SPI Gigabyte device."
>> is enabling the driver CONFIG_* into smdk5250 configuration entries.
>>
>> Is this valid, please correct me if am wrong.
>
> Doesn't patch "SMDK5250: Enable SPI Gigabyte device" immediately follow
> patch "SF: Add driver for Gigabyte device GD25LQ and GD25Q64B" which
> creates said device?

OK I couldn't observer actual commit prefix for this gigabyte flash driver.
May it could have sf: gigabyte:

Any way please continue-

--
Thanks,
Jagan.

>
>> --
>> Thanks,
>> Jagan.
>
> Amicalement,
> --
> Albert.
Minkyu Kang June 19, 2013, 12:11 p.m. UTC | #8
On 19/06/13 20:30, Albert ARIBAUD wrote:
> Hi Minkyu,
> 
> On Mon, 17 Jun 2013 11:10:58 +0900, Minkyu Kang <mk7.kang@samsung.com>
> wrote:
> 
>> Dear Albert,
>>
>> The following changes since commit d0a51373131c4ba565a2391d5ed78b87c406ce98:
>>
>>   at91sam9260ek: move board id setup to config header (2013-05-12 16:49:14 +0200)
>>
>> are available in the git repository at:
>>
>>   git://git.denx.de/u-boot-samsung master
>>
>> for you to fetch changes up to ed7bdc03eb516fb698ccc12ec5b4b9f132d05c5f:
>>
>>   MMC: DWMMC: Fix FIFO_DEPTH calculation (2013-06-17 11:03:42 +0900)
> 
> I had three merge conflicts here, two solved automatically (files
> drivers/mmc/mmc.c and include/mmc.h) and one manually (spl/Makefile).
> 
> I have pushed the resulting branch as mastercandidate.
> 
> Please confirm that the resolutions are ok.

It's good. confirmed.

> 
> Amicalement,
> 

Thanks,
Minkyu Kang.
Albert ARIBAUD June 19, 2013, 3:59 p.m. UTC | #9
Hi Minkyu,

On Mon, 17 Jun 2013 11:10:58 +0900, Minkyu Kang <mk7.kang@samsung.com>
wrote:

> Dear Albert,
> 
> The following changes since commit d0a51373131c4ba565a2391d5ed78b87c406ce98:
> 
>   at91sam9260ek: move board id setup to config header (2013-05-12 16:49:14 +0200)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-samsung master
> 
> for you to fetch changes up to ed7bdc03eb516fb698ccc12ec5b4b9f132d05c5f:
> 
>   MMC: DWMMC: Fix FIFO_DEPTH calculation (2013-06-17 11:03:42 +0900)
> 
> ----------------------------------------------------------------
> Akshay Saraswat (2):
>       Exynos5: clock: Update the equation to calculate PLL output frequency
>       Exynos: uart: s5p: enabling the uart tx/rx fifo
> 
> Amar (9):
>       FDT: Add compatible string for DWMMC
>       EXYNOS5: FDT: Add DWMMC device node data
>       DWMMC: Initialise dwmci and resolve EMMC read write issues
>       EXYNOS5: DWMMC: Added FDT support for DWMMC
>       EXYNOS5: DWMMC: Initialise the local variable to avoid unwanted results.
>       SMDK5250: Initialise and Enable DWMMC, support FDT and non-FDT
>       MMC: APIs to support resize of EMMC boot partition
>       SMDK5250: Enable EMMC booting
>       COMMON: MMC: Command to support EMMC booting and to resize EMMC boot partition
> 
> Arkadiusz Wlodarczyk (1):
>       arm:trats: change auto-booting to boot kernel with separate device tree blob
> 
> Inderpal Singh (3):
>       exynos: move tzpc_init to armv7/exynos
>       exynos: update tzpc to make it common for exynos4 and exynos5
>       exynos: Update origen and smdkv310 to use common tzpc_init
> 
> Naveen Krishna Chatradhi (2):
>       power: exynos-tmu: fix warnings and clean up code
>       power: exynos-tmu: use the mux_addr bit fields in tmu_control register
> 
> Rajeshwari Shinde (3):
>       SF: Add driver for Gigabyte device GD25LQ and GD25Q64B
>       SMDK5250: Enable SPI Gigabyte device.
>       MMC: DWMMC: Fix FIFO_DEPTH calculation
> 
>  arch/arm/cpu/armv7/exynos/Makefile                 |    2 +-
>  arch/arm/cpu/armv7/exynos/clock.c                  |   10 +-
>  .../arm/cpu/armv7/exynos/tzpc.c                    |   25 +-
>  arch/arm/cpu/armv7/s5p-common/Makefile             |    2 +
>  arch/arm/dts/exynos5250.dtsi                       |   33 ++
>  arch/arm/include/asm/arch-exynos/cpu.h             |    4 +
>  arch/arm/include/asm/arch-exynos/dwmmc.h           |   11 +-
>  arch/arm/include/asm/arch-exynos/tmu.h             |   58 ++-
>  arch/arm/include/asm/arch-exynos/tzpc.h            |   20 +
>  board/samsung/dts/exynos5250-smdk5250.dts          |   24 ++
>  board/samsung/origen/lowlevel_init.S               |   44 +-
>  board/samsung/origen/origen_setup.h                |   25 --
>  board/samsung/smdk5250/Makefile                    |    5 +-
>  board/samsung/smdk5250/clock_init.c                |   18 +
>  board/samsung/smdk5250/clock_init.h                |    5 +
>  board/samsung/smdk5250/exynos5-dt.c                |  423 ++++++++++++++++++++
>  board/samsung/smdk5250/lowlevel_init.S             |    2 +
>  board/samsung/smdk5250/setup.h                     |   25 --
>  board/samsung/smdk5250/smdk5250.c                  |  223 +++--------
>  board/samsung/smdk5250/spl_boot.c                  |   64 ++-
>  board/samsung/smdkv310/lowlevel_init.S             |   60 +--
>  common/cmd_mmc.c                                   |  109 ++++-
>  doc/device-tree-bindings/exynos/dwmmc.txt          |   54 +++
>  drivers/mmc/dw_mmc.c                               |   27 +-
>  drivers/mmc/exynos_dw_mmc.c                        |  127 +++++-
>  drivers/mmc/mmc.c                                  |  134 +++++++
>  drivers/mtd/spi/Makefile                           |    1 +
>  drivers/mtd/spi/gigadevice.c                       |   81 ++++
>  drivers/mtd/spi/spi_flash.c                        |    3 +
>  drivers/mtd/spi/spi_flash_internal.h               |    1 +
>  drivers/power/exynos-tmu.c                         |  123 +++---
>  drivers/serial/serial_s5p.c                        |   13 +-
>  drivers/video/exynos_fb.c                          |    4 +-
>  include/configs/exynos5250-dt.h                    |   11 +-
>  include/configs/origen.h                           |    2 +
>  include/configs/smdkv310.h                         |    2 +
>  include/configs/trats.h                            |   17 +-
>  include/dwmmc.h                                    |    3 +
>  include/fdtdec.h                                   |    1 +
>  include/mmc.h                                      |   26 ++
>  lib/fdtdec.c                                       |    1 +
>  spl/Makefile                                       |    4 +
>  42 files changed, 1356 insertions(+), 471 deletions(-)
>  rename board/samsung/smdk5250/tzpc_init.c => arch/arm/cpu/armv7/exynos/tzpc.c (69%)
>  create mode 100644 board/samsung/smdk5250/exynos5-dt.c
>  create mode 100644 doc/device-tree-bindings/exynos/dwmmc.txt
>  create mode 100644 drivers/mtd/spi/gigadevice.c

Applied to u-boot-arm/master, thanks!

Amicalement,