[GIT PULL 1/4] ARM: imx: cleanup for 4.2

[GIT PULL 1/4] ARM: imx: cleanup for 4.2

[Shawn Guo]

The following changes since commit b787f68c36d49bb1d9236f403813641efa74a031:

  Linux 4.1-rc1 (2015-04-26 17:59:10 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git tags/imx-cleanup-4.2

for you to fetch changes up to cb2e1a234c163d429712c0fa8eef8ab01499b738:

  ARM: imx: gpc: Remove .owner field (2015-05-11 21:38:25 +0800)

----------------------------------------------------------------
The i.MX cleanup for 4.2:
 - Remove eukrea_mbimxsd35 non-DT board files
 - Remove .owner field from gpc platform driver

----------------------------------------------------------------
Fabio Estevam (2):
      ARM: imx: Remove eukrea_mbimxsd35 non-dt support
      ARM: imx: gpc: Remove .owner field

 arch/arm/mach-imx/Kconfig                      |  34 ---
 arch/arm/mach-imx/Makefile                     |   2 -
 arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 318 -------------------------
 arch/arm/mach-imx/gpc.c                        |   1 -
 arch/arm/mach-imx/mach-cpuimx35.c              | 206 ----------------
 5 files changed, 561 deletions(-)
 delete mode 100644 arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c
 delete mode 100644 arch/arm/mach-imx/mach-cpuimx35.c

[GIT PULL 2/4] ARM: imx: soc updates for 4.2

[Shawn Guo]

The following changes since commit b787f68c36d49bb1d9236f403813641efa74a031:

  Linux 4.1-rc1 (2015-04-26 17:59:10 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git tags/imx-soc-4.2

for you to fetch changes up to ef6c578329c7bb37b60ed1e29d2136e234e2bbdb:

  ARM: imx: imx7d requires anatop (2015-05-29 21:57:14 +0800)

----------------------------------------------------------------
The i.MX SoC updates for 4.2:
 - Add new SoC i.MX7D support, which integrates two Cortex-A7 and one
   Cortex-M4 cores.
 - Support suspend from IRAM on i.MX53, so that DDR pins can be set to
   high impedance for more power saving during suspend.
 - Move i.MX clock drivers from arch/arm/mach-imx to drivers/clk/imx.
 - Move i.MX GPT timer driver from arch/arm/mach-imx into
   drivers/clocksource.
 - A couple of clock driver update for VF610 and i.MX6Q.
 - A few random code correction and improvement.

----------------------------------------------------------------
Anson Huang (3):
      ARM: imx: using unsigned variable for do_div
      ARM: imx7d: add low level debug uart support
      ARM: imx: add msl support for imx7d

Arnd Bergmann (2):
      ARM: imx: make imx51/3 suspend optional
      ARM: imx: imx7d requires anatop

Fabio Estevam (2):
      clk: imx: clk-cpu: Include "clk.h" header file
      ARM: imx: mmdc: Include "common.h" header file

Frank Li (2):
      ARM: clk: imx: update pllv3 to support imx7
      ARM: imx: add imx7d clk tree support

Joe Perches (1):
      ARM: mach-imx: iomux-imx31: Use DECLARE_BITMAP

Krzysztof Kozlowski (1):
      ARM: imx: Constify irq_domain_ops

Martin Fuzzey (1):
      ARM: imx53: Set DDR pins to high impedance when in suspend to RAM.

Mirza Krak (1):
      ARM: imx: clk-v610: Add clock for I2C2 and I2C3

Shawn Guo (26):
      ARM: imx: use dynamic mapping for timer
      ARM: imx: use dynamic mapping for CCM
      ARM: imx: move revision definitions and declarations into a header
      ARM: imx5: let pm code map CCM block on its own
      ARM: imx6: set initial power mode in pm function
      ARM: imx6: let pm code map CCM block on its own
      ARM: imx6: do not use cpu_is_xxx() in clock driver
      ARM: imx: add clk-pllv1 type support
      ARM: imx: remove inclusions of platform headers
      ARM: imx: move clock drivers into drivers/clk
      MAINTAINERS: add new folders into IMX entry
      ARM: imx: drop epit timer initialization from imx35 clock driver
      ARM: imx6: initialize CCM_CLPCR_LPM into RUN mode earlier
      ARM: imx: use relaxed IO accessor in timer driver
      ARM: imx: move timer resources into a structure
      ARM: imx: define an enum for gpt timer device type
      ARM: imx: initialize gpt device type for DT boot
      ARM: imx: setup tctl register in device specific function
      ARM: imx: set up .set_next_event hook via imx_gpt_data
      ARM: imx: move clock event variables into imx_timer
      ARM: imx: define gpt register offset per device type
      ARM: imx: get rid of variable timer_base
      ARM: imx: provide gpt device specific irq functions
      ARM: imx: remove platform headers from timer driver
      ARM: imx: move timer driver into drivers/clocksource
      clocksource: timer-imx-gpt: remove include of <asm/mach/time.h>

Shenwei Wang (2):
      ARM: imx: Remove the duplicated function declaration
      ARM: imx: Correct the comments in time.c

Stefan Agner (1):
      ARM: imx: clk-vf610: enable debug access port by default

S??bastien Szymanski (1):
      ARM: clk-imx6q: refine sata's parent

 MAINTAINERS                                        |   2 +
 arch/arm/Kconfig.debug                             |  13 +-
 arch/arm/include/debug/imx-uart.h                  |  15 +-
 arch/arm/mach-imx/Kconfig                          |  11 +-
 arch/arm/mach-imx/Makefile                         |  31 +-
 arch/arm/mach-imx/anatop.c                         |   5 +-
 arch/arm/mach-imx/common.h                         |  15 +-
 arch/arm/mach-imx/cpu.c                            |   3 +
 arch/arm/mach-imx/cpuidle-imx6q.c                  |   4 +-
 arch/arm/mach-imx/cpuidle-imx6sl.c                 |   4 +-
 arch/arm/mach-imx/cpuidle-imx6sx.c                 |   4 +-
 arch/arm/mach-imx/gpc.c                            |   2 +-
 arch/arm/mach-imx/hardware.h                       |   1 +
 arch/arm/mach-imx/iomux-imx31.c                    |   2 +-
 arch/arm/mach-imx/mach-imx6q.c                     |   1 +
 arch/arm/mach-imx/mach-imx6sl.c                    |   1 +
 arch/arm/mach-imx/mach-imx6sx.c                    |   1 +
 arch/arm/mach-imx/mach-imx7d.c                     |  43 ++
 arch/arm/mach-imx/mmdc.c                           |   2 +
 arch/arm/mach-imx/mx27.h                           |   4 -
 arch/arm/mach-imx/mx3x.h                           |   7 -
 arch/arm/mach-imx/mxc.h                            |  24 +-
 arch/arm/mach-imx/pm-imx5.c                        | 205 ++++-
 arch/arm/mach-imx/pm-imx6.c                        |  38 +-
 arch/arm/mach-imx/suspend-imx53.S                  | 139 ++++
 arch/arm/mach-imx/time.c                           | 385 ---------
 drivers/clk/Makefile                               |   1 +
 drivers/clk/imx/Makefile                           |  26 +
 {arch/arm/mach-imx => drivers/clk/imx}/clk-busy.c  |   0
 {arch/arm/mach-imx => drivers/clk/imx}/clk-cpu.c   |   1 +
 .../mach-imx => drivers/clk/imx}/clk-fixup-div.c   |   0
 .../mach-imx => drivers/clk/imx}/clk-fixup-mux.c   |   0
 .../clk/imx}/clk-gate-exclusive.c                  |   0
 {arch/arm/mach-imx => drivers/clk/imx}/clk-gate2.c |   0
 {arch/arm/mach-imx => drivers/clk/imx}/clk-imx1.c  |  17 +-
 {arch/arm/mach-imx => drivers/clk/imx}/clk-imx21.c |  14 +-
 {arch/arm/mach-imx => drivers/clk/imx}/clk-imx25.c |   6 +-
 {arch/arm/mach-imx => drivers/clk/imx}/clk-imx27.c |  15 +-
 {arch/arm/mach-imx => drivers/clk/imx}/clk-imx31.c |  35 +-
 {arch/arm/mach-imx => drivers/clk/imx}/clk-imx35.c |  36 +-
 .../mach-imx => drivers/clk/imx}/clk-imx51-imx53.c |   5 +-
 {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6q.c |  36 +-
 .../arm/mach-imx => drivers/clk/imx}/clk-imx6sl.c  |   7 -
 .../arm/mach-imx => drivers/clk/imx}/clk-imx6sx.c  |   6 -
 drivers/clk/imx/clk-imx7d.c                        | 860 +++++++++++++++++++++
 {arch/arm/mach-imx => drivers/clk/imx}/clk-pfd.c   |   0
 {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv1.c |  33 +-
 {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv2.c |   0
 {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv3.c |  13 +-
 {arch/arm/mach-imx => drivers/clk/imx}/clk-vf610.c |   4 +
 {arch/arm/mach-imx => drivers/clk/imx}/clk.c       |   0
 {arch/arm/mach-imx => drivers/clk/imx}/clk.h       |  14 +-
 drivers/clocksource/Kconfig                        |   6 +
 drivers/clocksource/Makefile                       |   1 +
 drivers/clocksource/timer-imx-gpt.c                | 529 +++++++++++++
 include/dt-bindings/clock/imx7d-clock.h            | 450 +++++++++++
 include/dt-bindings/clock/vf610-clock.h            |   3 +-
 include/soc/imx/revision.h                         |  37 +
 include/soc/imx/timer.h                            |  26 +
 59 files changed, 2582 insertions(+), 561 deletions(-)
 create mode 100644 arch/arm/mach-imx/mach-imx7d.c
 create mode 100644 arch/arm/mach-imx/suspend-imx53.S
 delete mode 100644 arch/arm/mach-imx/time.c
 create mode 100644 drivers/clk/imx/Makefile
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-busy.c (100%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-cpu.c (99%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-fixup-div.c (100%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-fixup-mux.c (100%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-gate-exclusive.c (100%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-gate2.c (100%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx1.c (91%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx21.c (95%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx25.c (98%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx27.c (97%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx31.c (91%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx35.c (94%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx51-imx53.c (99%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6q.c (98%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6sl.c (99%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6sx.c (99%)
 create mode 100644 drivers/clk/imx/clk-imx7d.c
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pfd.c (100%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv1.c (75%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv2.c (100%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv3.c (96%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk-vf610.c (98%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk.c (100%)
 rename {arch/arm/mach-imx => drivers/clk/imx}/clk.h (94%)
 create mode 100644 drivers/clocksource/timer-imx-gpt.c
 create mode 100644 include/dt-bindings/clock/imx7d-clock.h
 create mode 100644 include/soc/imx/revision.h
 create mode 100644 include/soc/imx/timer.h

[GIT PULL 3/4] ARM: imx: device tree changes for 4.2

[Shawn Guo]

Hi Arnd, Olof,

Please be noted that imx/soc branch was merged into imx/dt to resolve
a dependency between i.MX7D device tree source and clock driver on those
clock ID macros.

Shawn

The following changes since commit a75d9fd40d1ae4ddc7c7bc129a2ee75a9f81bb83:

  ARM: imx: add imx7d clk tree support (2015-05-19 14:41:09 +0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git tags/imx-dt-4.2

for you to fetch changes up to 38b16dee035307c6491675ae84b40d1bd60e0058:

  ARM: dts: imx6: add DT for aristainetos2 board (2015-05-27 20:03:21 +0800)

----------------------------------------------------------------
The i.MX device tree changes for 4.2:
 - Add device tree for i.MX7D SoC and imx7d-sdb board
 - New i.MX6 board support: Armadeus Systems APF6, Gateworks GW5510,
   and aristainetos2 boards
 - Change LVDS to use simple-panel for nitrogen6x and sabrelite boards
 - Add Wifi/Bluetooth devices support for cubox-i board
 - Remove unused regulators and correct OTG roles setting for
   imx6sl-warp board
 - Add I2C support for imx23-olinuxino board
 - Move imx6qdl HDMI device to a better place
 - Add power-domain for imx6qdl CODA device

----------------------------------------------------------------
Cory Tusar (1):
      ARM: dts: vf610: Nomenclature fixup for PTC12 pin used in RMII mode.

Eric Nelson (2):
      ARM: dts: nitrogen6x: use simple-panel instead of display-timings for LVDS0
      ARM: dts: sabrelite: use simple-panel instead of display-timings for LVDS0

Fabio Estevam (7):
      ARM: dts: hummingboard: Remove unneeded 'fsl,mode' property
      ARM: dts: imx6qdl-hummingboard: Add PCIe support
      ARM: dts: imx6sl-warp: Remove unused regulator
      ARM: dts: imx6sl-warp: Remove USB regulators
      ARM: dts: imx6sl-warp: Fix OTG roles
      ARM: dts: cubox-i: add support for Broadcom Wifi/Bluetooth devices
      ARM: dts: cubox-i/hummingboard: Fix the license text

Frank Li (4):
      ARM: dts: add pinfunc include file to support imx7d
      Document: dt: binding: imx: update document for imx7d support
      ARM: dts: add imx7d soc dtsi file
      ARM: dts: add imx7d-sdb support

Harald Geyer (2):
      ARM: dts: imx23: Add i2c support
      ARM: dts: imx23-olinuxino: Add i2c support

Heiko Schocher (1):
      ARM: dts: imx6: add DT for aristainetos2 board

Lucas Stach (1):
      ARM: dts: imx6qdl: move HDMI controller to right location in DT

Philipp Zabel (1):
      ARM: dts: imx6qdl: Add power-domain phandle to CODA device node

Shawn Guo (1):
      Merge branch 'imx/soc' into imx/dt

S??bastien Szymanski (1):
      ARM: dts: Armadeus Systems APF6 family support (i.MX6)

Thomas Niederpr??m (1):
      ARM: mxs: fix in tree users of ssd1306

Tim Harvey (1):
      ARM: dts: Gateworks GW5510 support (i.MX6)

 .../devicetree/bindings/clock/imx7d-clock.txt      |   13 +
 .../bindings/pinctrl/fsl,imx7d-pinctrl.txt         |   27 +
 arch/arm/boot/dts/Makefile                         |    8 +
 arch/arm/boot/dts/imx23-olinuxino.dts              |    6 +
 arch/arm/boot/dts/imx23.dtsi                       |   40 +-
 arch/arm/boot/dts/imx28-cfa10036.dts               |    3 +
 arch/arm/boot/dts/imx6dl-apf6dev.dts               |   60 ++
 arch/arm/boot/dts/imx6dl-aristainetos2_4.dts       |  159 +++
 arch/arm/boot/dts/imx6dl-aristainetos2_7.dts       |   97 ++
 arch/arm/boot/dts/imx6dl-cubox-i.dts               |    5 +-
 arch/arm/boot/dts/imx6dl-gw551x.dts                |   55 ++
 arch/arm/boot/dts/imx6dl-hummingboard.dts          |    5 +-
 arch/arm/boot/dts/imx6q-apf6dev.dts                |   64 ++
 arch/arm/boot/dts/imx6q-cubox-i.dts                |    5 +-
 arch/arm/boot/dts/imx6q-gw551x.dts                 |   55 ++
 arch/arm/boot/dts/imx6q-hummingboard.dts           |    5 +-
 arch/arm/boot/dts/imx6qdl-apf6.dtsi                |  158 +++
 arch/arm/boot/dts/imx6qdl-apf6dev.dtsi             |  479 +++++++++
 arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi       |  633 ++++++++++++
 arch/arm/boot/dts/imx6qdl-cubox-i.dtsi             |    5 +-
 arch/arm/boot/dts/imx6qdl-gw551x.dtsi              |  314 ++++++
 arch/arm/boot/dts/imx6qdl-hummingboard.dtsi        |   19 +-
 arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi     |    5 +-
 arch/arm/boot/dts/imx6qdl-microsom.dtsi            |  108 +-
 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi          |   30 +-
 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi           |   30 +-
 arch/arm/boot/dts/imx6qdl.dtsi                     |   57 +-
 arch/arm/boot/dts/imx6sl-warp.dts                  |   39 +-
 arch/arm/boot/dts/imx7d-pinfunc.h                  | 1038 ++++++++++++++++++++
 arch/arm/boot/dts/imx7d-sdb.dts                    |  408 ++++++++
 arch/arm/boot/dts/imx7d.dtsi                       |  486 +++++++++
 arch/arm/boot/dts/vf-colibri.dtsi                  |    2 +-
 arch/arm/boot/dts/vf610-cosmic.dts                 |    2 +-
 arch/arm/boot/dts/vf610-pinfunc.h                  |    2 +-
 arch/arm/boot/dts/vf610-twr.dts                    |    2 +-
 35 files changed, 4303 insertions(+), 121 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/imx7d-clock.txt
 create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt
 create mode 100644 arch/arm/boot/dts/imx6dl-apf6dev.dts
 create mode 100644 arch/arm/boot/dts/imx6dl-aristainetos2_4.dts
 create mode 100644 arch/arm/boot/dts/imx6dl-aristainetos2_7.dts
 create mode 100644 arch/arm/boot/dts/imx6dl-gw551x.dts
 create mode 100644 arch/arm/boot/dts/imx6q-apf6dev.dts
 create mode 100644 arch/arm/boot/dts/imx6q-gw551x.dts
 create mode 100644 arch/arm/boot/dts/imx6qdl-apf6.dtsi
 create mode 100644 arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
 create mode 100644 arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi
 create mode 100644 arch/arm/boot/dts/imx6qdl-gw551x.dtsi
 create mode 100644 arch/arm/boot/dts/imx7d-pinfunc.h
 create mode 100644 arch/arm/boot/dts/imx7d-sdb.dts
 create mode 100644 arch/arm/boot/dts/imx7d.dtsi

[GIT PULL 4/4] ARM: imx: defconfig updates for 4.2

[Shawn Guo]

The following changes since commit b787f68c36d49bb1d9236f403813641efa74a031:

  Linux 4.1-rc1 (2015-04-26 17:59:10 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git tags/imx-defconfig-4.2

for you to fetch changes up to f218e14b62339c6c28aa0c419eba200463cec99a:

  ARM: imx_v6_v7_defconfig: updates for Armadeus Systems APF6 boards (2015-05-19 13:20:00 +0800)

----------------------------------------------------------------
The i.MX defconfig updates for 4.2:
 - Enable i.MX7D and LS1021A SoC support
 - Enable support for WL1271 WIFI/BT, SX8654 I2C touchscreen and PCF8523
   RTC, which can be found on Armadeus Systems APF6 and Cubox-i boards.

----------------------------------------------------------------
Fabio Estevam (2):
      ARM: imx_v6_v7_defconfig: Enable RTC PCF8523 support
      ARM: imx_v6_v7_defconfig: Select LS1021A

Frank Li (1):
      ARM: config: imx_v6_v7_defconfig add imx7d support

S??bastien Szymanski (1):
      ARM: imx_v6_v7_defconfig: updates for Armadeus Systems APF6 boards

 arch/arm/configs/imx_v6_v7_defconfig | 9 +++++++++
 1 file changed, 9 insertions(+)

[GIT PULL 4/4] ARM: imx: defconfig updates for 4.2

[Arnd Bergmann]

On Monday 01 June 2015 15:53:26 Shawn Guo wrote:
> The i.MX defconfig updates for 4.2:
>  - Enable i.MX7D and LS1021A SoC support
>  - Enable support for WL1271 WIFI/BT, SX8654 I2C touchscreen and PCF8523
>    RTC, which can be found on Armadeus Systems APF6 and Cubox-i boards.
> 
> 

Pulled into next/defconfig, thanks!

	Arnd

[GIT PULL 1/4] ARM: imx: cleanup for 4.2

[Arnd Bergmann]

On Monday 01 June 2015 15:53:23 Shawn Guo wrote:
> The i.MX cleanup for 4.2:
>  - Remove eukrea_mbimxsd35 non-DT board files
>  - Remove .owner field from gpc platform driver
> 

Pulled into next/cleanup, thanks!

	Arnd

[GIT PULL 3/4] ARM: imx: device tree changes for 4.2

[Arnd Bergmann]

On Monday 01 June 2015 15:53:25 Shawn Guo wrote:
> The i.MX device tree changes for 4.2:
>  - Add device tree for i.MX7D SoC and imx7d-sdb board
>  - New i.MX6 board support: Armadeus Systems APF6, Gateworks GW5510,
>    and aristainetos2 boards
>  - Change LVDS to use simple-panel for nitrogen6x and sabrelite boards
>  - Add Wifi/Bluetooth devices support for cubox-i board
>  - Remove unused regulators and correct OTG roles setting for
>    imx6sl-warp board
>  - Add I2C support for imx23-olinuxino board
>  - Move imx6qdl HDMI device to a better place
>  - Add power-domain for imx6qdl CODA device
> 
> 

Hi Shawn,

If it's not too much of a hassle, could you rebase the soc and dt branches,
so that only the addition of the dt-bindings header is shared between
them, rather than the whole imx/soc branch?

Also, could you fold this change into the patch that moves the gpt driver?

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 3c15a49fdac9..fd43dbb5e47b 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -278,7 +278,7 @@ config CLKSRC_PXA
 
 config CLKSRC_IMX_GPT
 	bool "Clocksource using i.MX GPT" if COMPILE_TEST
-	depends on OF
+	depends on OF && COMMON_CLK
 	select CLKSRC_MMIO
 
 config H8300_TMR16

Without this, we get build errors for COMPILE_TEST.

	Arnd

[GIT PULL 3/4] ARM: imx: device tree changes for 4.2

[Fabio Estevam]

Hi Arnd,

On Mon, Jun 1, 2015 at 1:16 PM, Arnd Bergmann <arnd@arndb.de> wrote:

> Hi Shawn,
>
> If it's not too much of a hassle, could you rebase the soc and dt branches,
> so that only the addition of the dt-bindings header is shared between
> them, rather than the whole imx/soc branch?
>
> Also, could you fold this change into the patch that moves the gpt driver?
>
> diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
> index 3c15a49fdac9..fd43dbb5e47b 100644
> --- a/drivers/clocksource/Kconfig
> +++ b/drivers/clocksource/Kconfig
> @@ -278,7 +278,7 @@ config CLKSRC_PXA
>
>  config CLKSRC_IMX_GPT
>         bool "Clocksource using i.MX GPT" if COMPILE_TEST
> -       depends on OF
> +       depends on OF && COMMON_CLK
>         select CLKSRC_MMIO
>
>  config H8300_TMR16
>
> Without this, we get build errors for COMPILE_TEST.

Shouldn't it be like this instead?

--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -278,7 +278,7 @@ config CLKSRC_PXA

 config CLKSRC_IMX_GPT
        bool "Clocksource using i.MX GPT" if COMPILE_TEST
-       depends on OF
+       select CLKSRC_OF if OF
        select CLKSRC_MMIO

[GIT PULL 3/4] ARM: imx: device tree changes for 4.2

[Arnd Bergmann]

On Monday 01 June 2015 13:52:53 Fabio Estevam wrote:
> 
> Shouldn't it be like this instead?
> 
> --- a/drivers/clocksource/Kconfig
> +++ b/drivers/clocksource/Kconfig
> @@ -278,7 +278,7 @@ config CLKSRC_PXA
> 
>  config CLKSRC_IMX_GPT
>         bool "Clocksource using i.MX GPT" if COMPILE_TEST
> -       depends on OF
> +       select CLKSRC_OF if OF
>         select CLKSRC_MMIO

Yes, that's better than my approach. Thanks for taking a closer look!

	Arnd

[GIT PULL 3/4] ARM: imx: device tree changes for 4.2

[Shawn Guo]

On Mon, Jun 01, 2015 at 01:52:53PM -0300, Fabio Estevam wrote:
> > Also, could you fold this change into the patch that moves the gpt driver?
> >
> > diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
> > index 3c15a49fdac9..fd43dbb5e47b 100644
> > --- a/drivers/clocksource/Kconfig
> > +++ b/drivers/clocksource/Kconfig
> > @@ -278,7 +278,7 @@ config CLKSRC_PXA
> >
> >  config CLKSRC_IMX_GPT
> >         bool "Clocksource using i.MX GPT" if COMPILE_TEST
> > -       depends on OF
> > +       depends on OF && COMMON_CLK
> >         select CLKSRC_MMIO
> >
> >  config H8300_TMR16
> >
> > Without this, we get build errors for COMPILE_TEST.
> 
> Shouldn't it be like this instead?
> 
> --- a/drivers/clocksource/Kconfig
> +++ b/drivers/clocksource/Kconfig
> @@ -278,7 +278,7 @@ config CLKSRC_PXA
> 
>  config CLKSRC_IMX_GPT
>         bool "Clocksource using i.MX GPT" if COMPILE_TEST
> -       depends on OF
> +       select CLKSRC_OF if OF
>         select CLKSRC_MMIO

I just received a message [1] from Stephen which reports the build
failures on powerpc allyesconfig.  Basically, the errors are around the
following 3 things.

 1) delay_timer
 2) clk_get_sys
 3) SZ_4K

The 1) is an ARM specific implementation, so we need to depend on ARM.
For 2), clk_get_sys() is only available with CLKDEV_LOOKUP.  I can
understand that Arnd's change can help fix it, as COMMON_CLK indirectly
selects CLKDEV_LOOKUP.  But I'm not sure how CLKSRC_OF selecting is
going to help.  From compile test point of view, CLKSRC_OF is not
mandatory, since there is a stub clocksource_of_init() in
include/linux/clocksource.h for !CONFIG_CLKSRC_OF.  For 3), we need
the header include/linux/sizes.h.  It doesn't expose on ARM, and should
be fixed by a separate patch anyway.

[1] https://lkml.org/lkml/2015/6/1/328

So here is my changes to fix all the errors reported by Stephen, except
'SZ_4K' one.  Let me know if it's preferred or we'd like to drop
COMPILE_TEST and simply depend on ARCH_MXC.

------8<--------------

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 139a20795073..618102e5aa2a 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -261,7 +261,7 @@ config CLKSRC_PXA
 
 config CLKSRC_IMX_GPT
        bool "Clocksource using i.MX GPT" if COMPILE_TEST
-       depends on OF
+       depends on ARM && CLKDEV_LOOKUP
        select CLKSRC_MMIO
 
 endmenu

[GIT PULL 3/4] ARM: imx: device tree changes for 4.2

[Fabio Estevam]

On Tue, Jun 2, 2015 at 12:33 AM, Shawn Guo <shawn.guo@linaro.org> wrote:

> So here is my changes to fix all the errors reported by Stephen, except
> 'SZ_4K' one.  Let me know if it's preferred or we'd like to drop
> COMPILE_TEST and simply depend on ARCH_MXC.

I would say that we could drop COMPILE_TEST and use 'depends on
ARCH_MXC' instead.

Regards,

Fabio Estevam

[GIT PULL 3/4] ARM: imx: device tree changes for 4.2

[Arnd Bergmann]

On Tuesday 02 June 2015, Fabio Estevam wrote:
> Spam Status: Spamassassin 0% probability of being spam.
> 
> Full report:
> No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1  
> On Tue, Jun 2, 2015 at 12:33 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> 
> > So here is my changes to fix all the errors reported by Stephen, except
> > 'SZ_4K' one.  Let me know if it's preferred or we'd like to drop
> > COMPILE_TEST and simply depend on ARCH_MXC.
> 
> I would say that we could drop COMPILE_TEST and use 'depends on
> ARCH_MXC' instead.

Including COMPILE_TEST is generally a good idea, because it enables automatic
checking by build bots, e.g. the coverity bot that runs x86-64 allmodconfig.

	Arnd

[GIT PULL 3/4] ARM: imx: device tree changes for 4.2

[Shawn Guo]

On Tue, Jun 02, 2015 at 05:57:53PM +0200, Arnd Bergmann wrote:
> On Tuesday 02 June 2015, Fabio Estevam wrote:
> > Spam Status: Spamassassin 0% probability of being spam.
> > 
> > Full report:
> > No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1  
> > On Tue, Jun 2, 2015 at 12:33 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> > 
> > > So here is my changes to fix all the errors reported by Stephen, except
> > > 'SZ_4K' one.  Let me know if it's preferred or we'd like to drop
> > > COMPILE_TEST and simply depend on ARCH_MXC.
> > 
> > I would say that we could drop COMPILE_TEST and use 'depends on
> > ARCH_MXC' instead.
> 
> Including COMPILE_TEST is generally a good idea, because it enables automatic
> checking by build bots, e.g. the coverity bot that runs x86-64 allmodconfig.

For this particular case, it will not be covered by x86-64 test, as we
already need to depend on ARM due to delay_timer support.  But I agree
that having COMPILE_TEST is good in general, so will keep it.

Shawn