Commit graph

30739 commits

Author SHA1 Message Date
Olof Johansson
cf90bb2fe1 Second Round of Renesas ARM based SoC Board updates for v3.14
* r8a7791 (R-Car M2) based Koelsch board
   - Let Koelsch multiplatform boot with Koelsch DTB
   - Remove non-multiplatform DT reference support
   - Instantiate clkdevs for SCIF and CMT
   - Remove duplicate CCF initialization
   - Add Ether and DU support
 
 * r8a7790 (R-Car H2) based Lager board
   - Let Lager multiplatform boot with Lager DTB
   - Remove non-multiplatform DT reference support
   - Instantiate clkdevs for SCIF and CMT
   - Enable multiplaform kernel support
 
 * r8a7740 (R-Mobile A1) based Armadillo board
   - Set backlight enable GPIO
 
 * sh7374 (SH-Mobile AP4) based Mackerel board
   - Correct USBHS pinconf entry
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJSuYxAAAoJENfPZGlqN0++WXMP/AqZTLlhesmvshRzkUnY8QD9
 4JerjSAq3Bsj0mD0ytbGg0Og4QhXf+121BjL4eV588cXxkN0CbywR+R38WZf+0xf
 xb3Rv3zKdaE5u9k9fZ0OUXHsRmP2VqnAfNb63gKAcfKIincHq+IVm6Easrw1hrFk
 CaXANiZiHw5fsNXbxq8OPd2NZ2i9ZIy8THilRmcj/LMUHhziEnVf5R9rDzKuF5FR
 1VXSK3TSRCRWlKMNTELX4NdeeGOjwElcZAD+jGFsfhoJBwi3wfpDFLuYjE9BYPUh
 hEwMi2eMmP25+cOO5BfXFCZMnSgl0V4OTAUJa434ftrMwim9K1spBxPmlZtu22BP
 lpsq/zj+CcbPbmGfsIU5qa1Ysbmu421B5ATldI4d9n2tkdGKsC+0AK0Mo9WMjGTb
 XenBPPVpwhtx08jeXG/IIKhpGTdpd+BELmFHYaK0ROvz6vJrCxRd+xULL0cVSjt4
 1XJcvkZI45tBeO5ROw87c5bDHSJBhxLduEfWVGNnBkh+OUcaS0ufa/qR/kHpsFIX
 8Kcq6HZmFxIAJqCnR43pxXn+TMKaNTGGLv1avtz9TLwYo1/Y3/+LWf7ab2nLdYbg
 2lHnowBW75Gr8yAdk67IrtZWXH58PEyJxR0HfoNLEH5xqOjbiQt77RgrSoMGXteR
 qpRsTh/yVj6HFgJInObY
 =WXIZ
 -----END PGP SIGNATURE-----

Merge tag 'renesas-boards2-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

From Simon Horman:
Second Round of Renesas ARM based SoC Board updates for v3.14

* r8a7791 (R-Car M2) based Koelsch board
  - Let Koelsch multiplatform boot with Koelsch DTB
  - Remove non-multiplatform DT reference support
  - Instantiate clkdevs for SCIF and CMT
  - Remove duplicate CCF initialization
  - Add Ether and DU support

* r8a7790 (R-Car H2) based Lager board
  - Let Lager multiplatform boot with Lager DTB
  - Remove non-multiplatform DT reference support
  - Instantiate clkdevs for SCIF and CMT
  - Enable multiplaform kernel support

* r8a7740 (R-Mobile A1) based Armadillo board
  - Set backlight enable GPIO

* sh7374 (SH-Mobile AP4) based Mackerel board
  - Correct USBHS pinconf entry

* tag 'renesas-boards2-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (25 commits)
  ARM: shmobile: mackerel: Fix USBHS pinconf entry
  ARM: shmobile: Let Koelsch multiplatform boot with Koelsch DTB
  ARM: shmobile: Let Lager multiplatform boot with Lager DTB
  ARM: shmobile: Remove non-multiplatform Koelsch reference support
  ARM: shmobile: Remove non-multiplatform Lager reference support
  ARM: shmobile: koelsch-reference: Instantiate clkdevs for SCIF and CMT
  ARM: shmobile: lager-reference: Instantiate clkdevs for SCIF and CMT
  ARM: shmobile: koelsch-reference: Remove duplicate CCF initialization
  ARM: shmobile: lager-reference: Enable multiplaform kernel support
  ARM: shmobile: armadillo: Set backlight enable GPIO
  ARM: shmobile: Koelsch: add Ether support
  ARM: shmobile: koelsch: Add DU device
  arm: shmobile: clks: remove duplicated clock from r7s72100
  ARM: shmobile: koelsch: Conditionally select MICREL_PHY
  ARM: shmobile: rcar-gen2: Initialize CCF before clock sources
  ARM: shmobile: r8a7791: Add clock index macros for DT sources
  ARM: shmobile: r8a7790: Add clock index macros for DT sources
  ARM: shmobile: Add select MIGHT_HAVE_PCI for PCI-AHB bridge code
  ARM: shmobile: r8a7778: add USB Func DMAEngine support
  ARM: rcar-gen2: Do not setup timer in non-secure mode
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-01-02 11:25:10 -08:00
Olof Johansson
160c39a2d7 Merge branch 'qcom/boards' into next/boards
* qcom/boards:
  ARM: msm_defconfig: Enable restart driver
  defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974
  ARM: msm: Add support for APQ8074 Dragonboard
  ARM: dts: MSM8974: Add MMIO architected timer node
  ARM: dts: MSM8974: Add restart node
  ARM: msm: Simplify ARCH_MSM_DT config
  ARM: msm: Add support for MSM8974 SoC
  ARM: msm: trout: fix uninit var warning

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-01-02 11:24:50 -08:00
Stephen Boyd
21dea66951 ARM: msm_defconfig: Enable restart driver
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-01-02 11:24:46 -08:00
Rohit Vaswani
9b6dee50bb defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974
This patch enables MSM8974 build support.

Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-01-02 11:24:45 -08:00
Rohit Vaswani
9857a7531f ARM: msm: Add support for APQ8074 Dragonboard
This patch adds basic board support for APQ8074 Dragonboard
which belongs to the Snapdragon 800 family.
For now, just support a basic machine with device tree.

Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
Acked-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
[olof: Split off SoC and board support in separate patches]
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-01-02 11:24:44 -08:00
Stephen Boyd
47c5a5d6fd ARM: dts: MSM8974: Add MMIO architected timer node
Add the mmio architected timer node.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-01-02 10:21:21 -08:00
Stephen Boyd
74e848f633 ARM: dts: MSM8974: Add restart node
Add the restart node so we can reboot the device.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-01-02 10:21:20 -08:00
Stephen Boyd
17d0900c95 ARM: msm: Simplify ARCH_MSM_DT config
This doesn't need to be a def_bool y. Instead we can have every
DT supported platform select ARCH_MSM_DT and we achieve the same
thing with less chance of conflicts.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-01-02 10:21:20 -08:00
Rohit Vaswani
2aec37c659 ARM: msm: Add support for MSM8974 SoC
Add support for the Snapdragon 800 MSM8974 SoC, used on the Dragonboard
and others. Board support added in separate patch.

Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
Acked-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
[olof: split off SoC support in separate patch]
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-01-02 10:18:41 -08:00
Josh Cartwright
c4b4ecbda5 ARM: msm: trout: fix uninit var warning
Fix the following warning when !CONFIG_MMC:

arch/arm/mach-msm/board-trout.c: In function 'trout_init':
arch/arm/mach-msm/board-trout.c:67:6: warning: unused variable 'rc' [-Wunused-variable]
  int rc;
      ^

Also, while we're here, rework explicit printk(KERN_CRIT..) to use
pr_crit.

Signed-off-by: Josh Cartwright <joshc@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-01-02 10:16:56 -08:00
Olof Johansson
8708138951 Second Round of Renesas ARM Based SoC Defconfig Updates for v3.14
* r7s72100 SoC (RZ/A1H) based Genmai Board
   - Fixup I2C device on defconfig
   - Add gpio regulator support on defconfig
 
 * r8a7791 (R-Car M2) based Koelsch board
   - Do not disable CONFIG_{INOTIFY_USER,UNIX} in defconfig
   - Enable CONFIG_PACKET in defconfig
   - Enable Ether in defconfig
 
 * r8a7740 (R-Mobile A1) based Armadillo board
   - Enable backlight control in defconfig
 
 * r8a7740 (R-Mobile A1) based Armadillo board
   - Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJSuP0OAAoJENfPZGlqN0++MhsP/iV7i5qhbzKV6oPVFlBjpgMk
 cp/6KikJ/9e5Nz8nGd1Q3n22/Vkw+U2JYQ0wkofJerO4AEm/Ikwf1FSRlDG4l1OR
 q4/a8/ajIkZaExiztXQgwN73AyAE0vo8TWq+7qRlz6pmar8F3q32Lp1PwS7qK5zJ
 NfK/JkiYJ0wH1X9Z3l3oHvKKZtoveTBYUyP/wYyfipbmesumpytWESQHWvANm0LQ
 WL5haaT2F0auDLkMxnb9yIx+334oVDeRIyD/iDb3pu5OvA2Q1Xa5xWrnRYXSkOpq
 UfylrS2N5LEs2teHfHiU2Rce7PDtml5TDv+uORrqMd/l76+huJYmxZcMK88NepGb
 Si5Zl2GTdueAwdS1B0qdDQvkz7RYeETVwBagtQ16P6bWPbExivtqJa4zhdlm43jM
 tGvU6MVv5nrqgPLUOoFRJuwutU3mIQ8+36i+MMKnePjoEvG2iCgb/X/F5x2M3Cag
 xs6hsLlAkNOC/yr2A5DABzb3FPjhKvEjy0yNJFmJ0pyiHcUKuxO4HPEh74Dp0TTm
 q3UHLkjXBQf5IZo0U7qUuFL+rjz6u3EbvOgddfPnPCMKJIdEWe6OtYK2N2X+BFTJ
 g1tGWA2PeyO7XrNzEJ2Z5x10VTGjWywgAHRVmdBXJd0kIOARYdXRqB0Vy+M7LwKL
 5mjeK9mRR3u1Lbouuzs3
 =M9DB
 -----END PGP SIGNATURE-----

Merge tag 'renesas-defconfig2-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

From Simon Horman:
Second Round of Renesas ARM Based SoC Defconfig Updates for v3.14

* r7s72100 SoC (RZ/A1H) based Genmai Board
  - Fixup I2C device on defconfig
  - Add gpio regulator support on defconfig

* r8a7791 (R-Car M2) based Koelsch board
  - Do not disable CONFIG_{INOTIFY_USER,UNIX} in defconfig
  - Enable CONFIG_PACKET in defconfig
  - Enable Ether in defconfig

* r8a7740 (R-Mobile A1) based Armadillo board
  - Enable backlight control in defconfig

* r8a7740 (R-Mobile A1) based Armadillo board
  - Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY

* tag 'renesas-defconfig2-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: koelsch: Do not disable CONFIG_{INOTIFY_USER,UNIX} in defconfig
  ARM: shmobile: koelsch: Enable CONFIG_PACKET in defconfig
  ARM: shmobile: armadillo800eva: Enable backlight control in defconfig
  ARM: shmobile: Koelsch: enable Ether in defconfig
  ARM: shmobile: genmai: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY
  ARM: shmobile: lager: fixup I2C device on defconfig
  ARM: shmobile: lager: add gpio regulator support on defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-29 13:24:02 -08:00
Olof Johansson
acdcbd6331 Renesas ARM based SoC board updates for v3.14
* Global
   - Kconfig: Mention Renesas ARM SoCs instead of SH-Mobile
 
 * r7s72100 SoC (RZ/A1H) based Genmai Board
   - Add Multiplatform support
   - Add Reference DT
 
 * r8a7791 (R-Car M2) based Koelsch board
   - Add pinctrl_register_mappings() for Koelsch
   - Hook up SW30-SW36 on Koelsch
   - Mark GPIO keys as wake-up sources
   - Use ->init_late()
   - Add Multiplatform support
   - Set .debounce_interval for GPIO keys
   - Add SW2 to GPIO keys
   - Add Led 6, 7 and 8 support
   - Add reference DT
   - Enable PFC/GPIO
 
 * r8a7790 (R-Car H2) based Lager board
   - Add gpio/fixed regulator for SDHI
   - Add SPI FLASH support on QSPI
   - Mark GPIO keys as wake-up sources
   - Use ->init_late()
   - Set .debounce_interval for GPIO keys
 
 * r8a7778 (R-Car M1) based Bock-W board
   - bockw: remove unused RSND_SSI_CLK_FROM_ADG
   - Set .debounce_interval for GPIO keys
   - Correct FPGA ioremap area
   - Use regulator for MMCIF
 
 * r8a7740 (R-Mobile A1) based Armadillo board
   - Correct FSI address size
 
 * sh7374 (SH-Mobile AP4) based Mackerel board
   - Use pinconf API to configure pin pull-down
   - clk_round_rate() can return a zero to indicate an error
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJSt5cHAAoJENfPZGlqN0++xIoP/jBunLyY+xAZ+06gukAdKEw4
 hLoUH55GsvpaL5cuDT+LSXWafIol4A/wvME5sZJsKoCHRnDqQYKvyE7hDLIlvLRI
 KvcmFvdUcN6plbD/wz/SPzur/Lq3+DcX4ep8pmI7OUXupYWomibwylv/5UgY++PN
 Uymmre4CiHK7/wzWOyS79ujcGzdwk4o1ari5P2lC4fUlVM7jZ7DQswglo+jGxscw
 CXHtEfqto4NEh2+05sAGdmRHwb3xwOndPYwHaFWy+X6uce/BZXsgDipWihHI5ZKr
 FT+TemFlYwXc2In2F/E4T7aXqNDXSjEcX/x2/VHS5W2EoWbSk+Mz6zlFZduAv4oG
 c35AQjHMktlo6voZm0L4WgH0JYT4dyu6DJG3mo7adRyYKvjv/OC48wt4jhYa0LGZ
 XLcYBoaK1zqpG2M6ZIv138a9krGtkfSCy/Pt7YQ4WpA8CQyJlYqaoW9Yrpkhw13b
 OcO22myGbjMnxTwpqS9rwDPnNR2PjG9ExDHmO3x4k+zsLqyJHxzv6ikKJWl0eiUF
 JUv/mzxiaYsOBiMTYYuueNYegzhzGiW8jzp+j6E3WXTPxwCP2It8/31aBfyuaKcG
 B807//VKcHulPONe3emBK7I2KzsJ6UOUs7iHuqrdwoglQKqMC0iyy2/ZFXbu7JJU
 cMlHObCNFOGPZxKGsYXG
 =5zhn
 -----END PGP SIGNATURE-----

Merge tag 'renesas-boards-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

From Simon Horman:
Renesas ARM based SoC board updates for v3.14

* Global
  - Kconfig: Mention Renesas ARM SoCs instead of SH-Mobile

* r7s72100 SoC (RZ/A1H) based Genmai Board
  - Add Multiplatform support
  - Add Reference DT

* r8a7791 (R-Car M2) based Koelsch board
  - Add pinctrl_register_mappings() for Koelsch
  - Hook up SW30-SW36 on Koelsch
  - Mark GPIO keys as wake-up sources
  - Use ->init_late()
  - Add Multiplatform support
  - Set .debounce_interval for GPIO keys
  - Add SW2 to GPIO keys
  - Add Led 6, 7 and 8 support
  - Add reference DT
  - Enable PFC/GPIO

* r8a7790 (R-Car H2) based Lager board
  - Add gpio/fixed regulator for SDHI
  - Add SPI FLASH support on QSPI
  - Mark GPIO keys as wake-up sources
  - Use ->init_late()
  - Set .debounce_interval for GPIO keys

* r8a7778 (R-Car M1) based Bock-W board
  - bockw: remove unused RSND_SSI_CLK_FROM_ADG
  - Set .debounce_interval for GPIO keys
  - Correct FPGA ioremap area
  - Use regulator for MMCIF

* r8a7740 (R-Mobile A1) based Armadillo board
  - Correct FSI address size

* sh7374 (SH-Mobile AP4) based Mackerel board
  - Use pinconf API to configure pin pull-down
  - clk_round_rate() can return a zero to indicate an error

* tag 'renesas-boards-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (75 commits)
  ARM: shmobile: lager: add gpio/fixed regulator for SDHI
  ARM: shmobile: bockw: remove unused RSND_SSI_CLK_FROM_ADG
  ARM: shmobile: armadillo: fixup FSI address size
  ARM: Kconfig: Mention Renesas ARM SoCs instead of SH-Mobile
  ARM: shmobile: mackerel: Use pinconf API to configure pin pull-down
  ARM: shmobile: Lager:add SPI FLASH support on QSPI
  ARM: shmobile: mackerel: clk_round_rate() can return a zero to indicate an error
  ARM: shmobile: Add pinctrl_register_mappings() for Koelsch
  ARM: shmobile: Use ->init_late() on Lager
  ARM: shmobile: Hook up SW30-SW36 on Koelsch
  ARM: shmobile: koelsch: mark GPIO keys as wake-up sources
  ARM: shmobile: Use ->init_late() on Koelsch
  ARM: shmobile: lager: mark GPIO keys as wake-up sources
  ARM: shmobile: r7s72100 Genmai Multiplatform
  ARM: shmobile: r7s72100 Genmai DT reference C bits
  ARM: shmobile: r7s72100 Genmai DT reference DTS bits
  ARM: shmobile: Initial r8a7791 and Koelsch multiplatform support
  ARM: shmobile: koelsch: set .debounce_interval
  ARM: shmobile: lager: set .debounce_interval
  ARM: shmobile: bockw: add pin pull-up setting for SDHI
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-29 13:15:03 -08:00
Olof Johansson
fe5a365cdb Linux 3.13-rc5
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQEcBAABAgAGBQJSt1TYAAoJEHm+PkMAQRiGvWgH/iWg8TmEWz4KUKuHthuUi0uh
 9+2YDN+4k577Xa0obaG24giQeqkCdxMr3oJrS3FO9jeAmaNRHEGhxUPneisb7RtN
 9jIVsz5bPa9/DcK9nqtaUQdvA0O5AWTE6AAPmwleTVy+8CygBo987T2uGELnQCSR
 FrKCrMePc7Pj0uthMVXrpJ17Ffm/j7jkfRtPhrxHJyngh3jEux+tPbpynH/aKuO2
 47unsSQimoFk7n2SPFvNu3E/vZE2xVbu5SH9MCl5yyiCifFjpi3B71LV/FW51lvm
 cK8Jzn2BmYDygRFjnZfq4zJHqYJCBHzpjCLWmR37Dm/JS91aGq3+Cg0stDP8UTs=
 =+Hcn
 -----END PGP SIGNATURE-----

Merge tag 'v3.13-rc5' into next/boards

Need a newer base version to get a regulator fix for Samsung platforms that
they enable building in a defconfig.

Linux 3.13-rc5
2013-12-28 21:38:16 -08:00
Olof Johansson
4d77ce6c1f ARM: tegra: second set of defconfig changes
This branch contains changes to tegra_defconfig that came in after
 I sent the previous pull-request/tag tegra-for-3.14-defconfig. We enable:
 
 * DRM_PANEL/DRM_PANEL_SIMPLE, which implements the built-in LCD panel
   support for Harmony, Cardhu, and Dalmore.
 
 This branch is based on tag tegra-for-3.14-defconfig, for which I sent a
 previous pull request.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJStIafAAoJEMzrak5tbycx92QQAL3LyEJIAp3zUkT4QJXVEowh
 OnnwMiedwQZg07pT03VENznPGXkmP3jdvZv/QCe2UAdA02luyvX7ukWBnEuF43IY
 88VcgwXwObUsrdMYfJR6OtW7qOxobTN9lcuVjctixgI+mHrul0GnV6b7kYDNTa1m
 lWI9g12Tk2UFbvCzhXPFcU3es4S4g7F8Ffs8KHjTf/kpolXlXu1WcGoTgrYhr1mn
 qvI2FVsLnBcxbDZb5Prv0RO8pr9efgoXU4eDY30Od+/NYqWL4iVT56M6VdmFo/5P
 Ne3Plsg7LajJKilliUo/WPuKWsU1RepfG+6LNY+4WJAQNEhrrN2iSpUWfKOVbK4+
 Au7M/y1ObbtpnZLO0pzj7KBLOLPXXrhtkJm7NetuNcb7J57/HjPtq9y7FgouOdfz
 vpxjc1KRbZPXIS+QYFUfkmq6giS72hXRv4psySWUjwoLfojnsXx9E5YUoyQO7k1H
 SBulEUEQVy+l9VBssl6hrMaLqx4iN9hJ10nGsimjgwUxSZyTiYng8E/1D4wlkZrm
 4uakuYYKeLWVODURJNRpVBxmZe0U6MO7dzQkRZX1M/fAMtCqBUB94tdtCrKoq6o3
 xyRma7dUWeN/ohIckRRN5BPjfJ7m0Hg4Z/QlJ3+2EUH8FFnDcClbOxGbDbrM0SZW
 I7mL461zb1K8pW+8X8Y/
 =6BvU
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-3.14-defconfig-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/boards

From Stephen Warren:
ARM: tegra: second set of defconfig changes

This branch contains changes to tegra_defconfig that came in after
I sent the previous pull-request/tag tegra-for-3.14-defconfig. We enable:

* DRM_PANEL/DRM_PANEL_SIMPLE, which implements the built-in LCD panel
  support for Harmony, Cardhu, and Dalmore.

This branch is based on tag tegra-for-3.14-defconfig, for which I sent a
previous pull request.

* tag 'tegra-for-3.14-defconfig-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Enable DRM panel support

Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-27 13:11:39 -08:00
Olof Johansson
65f9c1312c ARM: tegra: defconfig changes
Enable new features required by the Venice2 board.
 
 This branch is based on v3.13-rc1, and shouldn't cause any conflicts.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJSr3LxAAoJEMzrak5tbycxEl4P/0in5tXY+k4ZxR2OyiBtCcgr
 sJLsaCCUE3vW1WpxKD/HlxFWxoAF1nC7jB0PlQsH0R/AFzGchrWRBZ+9OFe4jdcn
 PpN199r0kEk3cyniGlftbvvubbqPYrHO9RmeUtRIGN2BWZiYy2/IUhjdWMFOnlBD
 uSXNNCiTJtPPSjIhj02V1jmIMHNhDCi6Sk4Wzb079EAFA8kRC8a5fbuz78Q/W2wU
 3MAlL5MVBI2pfUeBk4c0B006hrES4cpErg/QtZSsWdpPEDowid0Zmg7hqWeKg8X2
 0N3gQo0UJfj5qc/CjzJ5nUr4qKCcaC8hXpKt6gkOqQnt0cZh6xBxaCxkphJoxFvJ
 /08A11UXsBw1iNeGMP2nv+bxlkECdgE2n7+IfB52eDszq7lAJGoE5Wvp2GHyvVkQ
 9uwQ7Lb5FL2mO27ASwnihcK7ND65XztyqJuO22oS/sEF99rrGLxXDeNOwgqCvCUi
 j39I4u064O/jtotza9K1yOhMdo3JW0n8qAyxM8/aljYvSF50lvQiuEyXgvwezSRr
 r6a4QiDpvDN964WxRNr/ALqKRu1mymz0oiQ0acc7f+0QAK37RFVpVJaJwzONHIY/
 +/PiseBRskDzqK/Rc1hTLquMRGCmzyQGeWSdgD52OAjWF98xtlLAFQsuFf7QZfAz
 Mnn5fB+GfiiSKMkyJ/ZU
 =8cB3
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-3.14-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/boards

From Stephen Warren:
ARM: tegra: defconfig changes

Enable new features required by the Venice2 board.

This branch is based on v3.13-rc1, and shouldn't cause any conflicts.

* tag 'tegra-for-3.14-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: tegra_defconfig updates

Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-26 11:05:04 -08:00
Olof Johansson
a80ffa191b mvebu defconfig changes for v3.14 (incremental #2)
- mvebu
     - enable nand support
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJSsGG8AAoJEP45WPkGe8ZnrFYP/1GFfBB89u1rkuOomxC4LDbY
 PeyMREVeVIejIeIlJ6b3HwzmHvU46Ji3zuJKEPQsud8rkAsi+CdR5OmZyvCuYcXl
 ZBEfWeC7NkoSMGPgN5TPQ3DzkAjHvo1rgsfJu2v5ef+jk0rf/3fMs8J/84Cu5UxQ
 bfgZORKXkIddYgCQYypnqFRtVSdzLcgwRa5i2MWXWuLx+ouOuzoCgypmbpAGX7GE
 88wyfwnfpXZCsru5rimifFdPaBAbz/dISC8Y1jA7tXPaWyuM4YZ/nSA/S5ScqJCY
 PdmlT92VoGJz5af/J0KeOULB9VXcR/69dJwoHieZOhIf2KFPwQdy6egp1oWvFXeC
 x6hmZM1twvub0MhdNR0YMVsF0ivQvcDpBjOmCuRaNidYaac2mflloRbQz4S3wVrl
 OzUcnj0F//UWPvfC9OQCUvo2LJBLliDE1RiCIM629Wi9uQkPhfTD1YiT6RNcNuhf
 Ue4nqq5f7CD1+/c1RaH+szsAXAakEzjL3uwLoR+zJ95BZ22EoE+AzWGslKeNo8dw
 fsld6DoLlgMwocyE0OF61LNcw9Jq2kXz1YoKM7h/GeGcTMdJLVwcMdFVglT1Uyfi
 WqeeEt/u84mQRoj8EHBW5CyM5EwZSBmSwaHiuQbVTJMCFMAy+FQLES2u56HHdQo3
 5FiUioBLYsXjinT2J2iv
 =C2mR
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-defconfig-3.14-2' of git://git.infradead.org/linux-mvebu into next/boards

From Jason Cooper:
mvebu defconfig changes for v3.14 (incremental #2)

 - mvebu
    - enable nand support

* tag 'mvebu-defconfig-3.14-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: config: Enable NAND support

Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-22 14:19:47 -08:00
Olof Johansson
103e76b3d6 exynos_defconfig updates for v3.14
- increase number of CPU to 8 for EXYNOS SoCs
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJSrf2OAAoJEA0Cl+kVi2xqGRwP/RRwDYNSz+0Es/DQUVFfFKVE
 +4vdZsGwlVtzt78Ns4VsNDi7XHqD3i4c4SQw/LB9jlFxxVSb3WNJbrKdZrhn6sFE
 WoWpYs+2LHjiItCanUOy0Mnqj72Dg6Gdh8JM7zmCy9RLlrDuALAuC5Md4WpoPnpp
 lKx8MzBt9x9hgFWtpnFBRPfVHKFmNvKoWGfLdu8kUmf//uJvNvGL4hURpC0zQgBd
 Ii9j6r3EQhLsb/CV7Hr8Fyojmf8YWD5Y5COxT1EzHOUY3Qn7z1ZCKI3pCyNVGBrL
 5Lurpaxo3M26Ibjm9yG2pz26tZSvm795ffCoN273jq2TKWu9Q+XOY8N+wAD/DuEY
 CyH71VYFp0CgDiFcLbQw49aa8iS7bVKLzIsU3MbebG1HzDrLQ8ZEHAIUiTnQs/y7
 WUTs8VKmLqYyg9CkQMhIDr5Fa4kkEFKUtNFSQKvThAiGqiZKQEnyV4PXkvYb9MhK
 /LWPjYfGgXEd4t7a3O1g8ZY/u2hqOqMmkYnwSYEgb6/MDympPOIppCDgBrIuNDpY
 VxksI2jno2CGtCph9OE4lFJjrexIBoK665sIEk+t0C5zpefdJCj5tEjN94vBm6EL
 aH0pMep11cLhnjsK1W/OpnjheP56B7sAuT4vE8JFlXu9IjarUi3jUVOdAZK/902Y
 fskRjxCczAV2pYUfxhnr
 =Lz/U
 -----END PGP SIGNATURE-----

Merge tag 'samsung-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/boards

From Kukjin Kim:
exynos_defconfig updates for v3.14
- increase number of CPU to 8 for EXYNOS SoCs

* tag 'samsung-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: exynos_defconfig: increase CONFIG_NR_CPUS value to 8

Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-22 14:04:34 -08:00
Linus Torvalds
93579aeec2 ARM: SoC fixes for 3.13-rc
Much smaller batch of fixes this week.
 
 Biggest one is a revert of an OMAP display change that removed some non-DT
 pinmux code that was still needed for 3.13 to get DSI displays to work.
 
 There's also a fix that resolves some misdescribed GPIO controller
 resources on shmobile. The rest are mostly smaller fixes, a couple of
 MAINTAINERS updates, etc.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJStx0EAAoJEIwa5zzehBx3G+gP/3qH83dbelntB3R7Ve3KbT41
 YT0q4G8s4Kper+qSXK2eJRTcEUfZBhtXw2GytnEjwdj6xRtTYmdzUIE/7awwzxQx
 EkcwyCKiMLhVqjBgYg0fr11RBmbvQxKV0L2iIHoV5N/VJa/I7DN4N1J0PwB/7tuQ
 OVpy3UOuutvtV3k4/G4tminixx1Y6JjPy7vEs8oiQoc7MRrMwe4zC2pgRF5eVfFG
 uNfRk1IEpvoFM+ir+ZmKJYVsEGXlC/bLwO7KPql6801n7987uQni9YoyUy+7cLGp
 CVCSaD7iGVPde8ijfUN84C8IezjfkA/wA9cxaGBj9lD7EdcvXEdtvDiFXpQcZDYY
 NZX9p7+ZzTNzKSRIPKET8Ky3GNqDGCoaCoV9YTpUGwMHXmoK66QJpNy1boW0fZ2B
 yy3gT0fxJYRKMTiFdV+y77BFpLDNkDGnjuVQEovKC8mX2YfqjR0sOTFjHBhPWk8P
 gZ2Lzq1V/j0gd6/YxNStVngQK6/CiA9/qBUeBgiIU6vAzPcpk4HcwapFCcUeU4mU
 l8Iga63cBu3iSobSNTcF7EB1iHwOQOTH7txtD1RtPsWxZgXG74kwmtWC336aEhlJ
 fixoZIQvzPdQLqtZIMm87jJHXYsBZJnnqCTmFTgfn26Wb79qnS4WMt2tahCLGrkO
 RGDjdfaXw46WbJZ25kcJ
 =6Nj7
 -----END PGP SIGNATURE-----

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Olof Johansson:
 "Much smaller batch of fixes this week.

  Biggest one is a revert of an OMAP display change that removed some
  non-DT pinmux code that was still needed for 3.13 to get DSI displays
  to work.

  There's also a fix that resolves some misdescribed GPIO controller
  resources on shmobile.  The rest are mostly smaller fixes, a couple of
  MAINTAINERS updates, etc"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  Revert "ARM: OMAP2+: Remove legacy mux code for display.c"
  MAINTAINERS: Add keystone clock drivers
  MAINTAINERS: Add keystone git tree information
  ARM: s3c64xx: dt: Fix boot failure due to double clock initialization
  ARM: shmobile: r8a7790: Fix GPIO resources in DTS
  irqchip: renesas-intc-irqpin: Fix register bitfield shift calculation
  ARM: shmobile: lager: phy fixup needs CONFIG_PHYLIB
2013-12-22 11:13:02 -08:00
Kevin Hilman
95fcfa70f3 Renesas ARM based SoC fixes for v3.13
* r8a7790 (R-Car H1) SoC
   - Correct GPIO resources in DT.
 
     This problem has been present since GPIOs were added to the r8a7790 SoC
     by f98e10c88a ("ARM: shmobile: r8a7790: Add GPIO controller
     devices to device tree") in v3.12-rc1.
 
 * irqchip renesas-intc-irqpin
   - Correct register bitfield shift calculation
 
     This bug has been present since the renesas-intc-irqpin driver was
     introduced by 443580486e ("irqchip: Renesas INTC External IRQ pin
     driver") in v3.10-rc1
 
 * Lager board
   - Do not build the phy fixup unless CONFIG_PHYLIB is enabled
 
     This problem was introduced by 48c8b96f21
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJSqmcQAAoJENfPZGlqN0++VTgP/3II1c6Wge1s9TjQ2FnD874X
 wVMLAY8oJp+mNiiov+iNtnP0deyjgWr2XfwQ8QNsWTVEAPQjvInOydr7B24SFb7e
 FnA5gscGQr49xMorR+x8yUnlyIE6UAbwwgbP2GljsrTZFURo9ohfUA3LP9wSPHJ9
 MYRopGb7ZlNaTwxEi5t6rZV3mrBSzbSUZ0YbQbN5vAhm1zoZ7hzfXUsk9ZwhVNnI
 RFHOy01DDCb0EM8Yut4DfWMri9VgsMcR+bo73Js1ljpkUujCzJsr5fNlpzCi2unX
 Xw9s6WCSNaNGLzgGbbLojAUIkrtMUEp/XT2iATIalKHT0zULqe6kNcnonFJ8GmQk
 nrNBF4/rn45S4QFSEiqavrWpmVE78pMEzPTBpmR15+KloLuutdYrqb/HUM60lVh3
 zVeL2cG9fTFx2CUODNX9ABGlO7CCDz4MgK5RgSpnnxjIgunLEb4gA+6ncqaQ4XhM
 Ldicte6ppq26PNQemiL61PbfVVNE6hcW//IZreFUEQkP2Ls/DzWfBVtOQaWj3fpb
 DEK/kvHGA1HVrLTt43WVM5kPy5OMKDGFv6w7NRayTMvUDguuwp5QeGxSFsi/104Z
 q5Qaekvi0wIGaWfkRGHB/8o9z/zL/ifW/cqNXqW1Yxf2+KZGuRWIpxZLzMwBfhzb
 LoENHwKcU/D7YhzXIGHG
 =Vbzt
 -----END PGP SIGNATURE-----

Merge tag 'renesas-fixes-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes

From Simon Horman:
Renesas ARM based SoC fixes for v3.13

* r8a7790 (R-Car H1) SoC
  - Correct GPIO resources in DT.

    This problem has been present since GPIOs were added to the r8a7790 SoC
    by f98e10c88a ("ARM: shmobile: r8a7790: Add GPIO controller
    devices to device tree") in v3.12-rc1.

* irqchip renesas-intc-irqpin
  - Correct register bitfield shift calculation

    This bug has been present since the renesas-intc-irqpin driver was
    introduced by 443580486e ("irqchip: Renesas INTC External IRQ pin
    driver") in v3.10-rc1

* Lager board
  - Do not build the phy fixup unless CONFIG_PHYLIB is enabled

    This problem was introduced by 48c8b96f21

* tag 'renesas-fixes-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7790: Fix GPIO resources in DTS
  irqchip: renesas-intc-irqpin: Fix register bitfield shift calculation
  ARM: shmobile: lager: phy fixup needs CONFIG_PHYLIB

Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-12-20 11:28:30 -08:00
Linus Torvalds
4203d0eb3a Bug-fixes:
- Fix balloon driver for auto-translate guests (PVHVM, ARM) to not use
    scratch pages.
  - Fix block API header for ARM32 and ARM64 to have proper layout
  - On ARM when mapping guests, stick on PTE_SPECIAL
  - When using SWIOTLB under ARM, don't call swiotlb functions twice
  - When unmapping guests memory and if we fail, don't return pages which
    failed to be unmapped.
  - Grant driver was using the wrong address on ARM.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQEcBAABAgAGBQJSsdFEAAoJEFjIrFwIi8fJDQwIAL1ygSTwSXdH6TlqtD9GVdsE
 G6kiCM7G6VXrKMf8zBtgbGpcl6FT0zOIz4cRcXbyDniuHTjdWuH9dlmZOzFMAirE
 uMWwOB1EfmRBEJRsd2pW0Gj0O6VABWh8BHklFCeWUvk/Stlw9uXqIwf7Pjcj6wPT
 XW+ZywqsAve4MM60Rz/nMsakLcTK4i5SCRgPPFgAnPKUod3f/QbEHwci/lpinJFv
 AuQp2JytCsDc2nehEi1kMwEx7LLBlUcjXTqPG5lhQnXrFleDtMdCJd9dGjeze7Qu
 F5sftfdlp18ojQwegv1PGiVI4jV8rIq29ybaef/y9DLd3nC3rmi8B8/m9RG2qyI=
 =dUsw
 -----END PGP SIGNATURE-----

Merge tag 'stable/for-linus-3.13-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull Xen bugfixes from Konrad Rzeszutek Wilk:
 - Fix balloon driver for auto-translate guests (PVHVM, ARM) to not use
   scratch pages.
 - Fix block API header for ARM32 and ARM64 to have proper layout
 - On ARM when mapping guests, stick on PTE_SPECIAL
 - When using SWIOTLB under ARM, don't call swiotlb functions twice
 - When unmapping guests memory and if we fail, don't return pages which
   failed to be unmapped.
 - Grant driver was using the wrong address on ARM.

* tag 'stable/for-linus-3.13-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/balloon: Seperate the auto-translate logic properly (v2)
  xen/block: Correctly define structures in public headers on ARM32 and ARM64
  arm: xen: foreign mapping PTEs are special.
  xen/arm64: do not call the swiotlb functions twice
  xen: privcmd: do not return pages which we have failed to unmap
  XEN: Grant table address, xen_hvm_resume_frames, is a phys_addr not a pfn
2013-12-20 09:34:54 -08:00
Kevin Hilman
cd15c51d6c I accidentally removed some mux code for omap4 that I thought was
dead code as omap4 has been booting with device tree only since
 v3.10. Turns out I also removed some display related mux code,
 so let's revert that except for the dead code parts.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJSsd7KAAoJEBvUPslcq6Vz19gQAK6IyA51RxgyTF6ads5SyNny
 HAl7AO/O4yoverXibgdGEe3V6Caye8QbsAVE0qyZAVgtPCattCclRGYUGy8fcy00
 mV/KhW6EcQXxApU37f+6uyAm7RrkMPzTP6glqH9IllvFZYsOTNlt6W5+W0juW97n
 1xZMvx75bz6aiOvox5mRmSySr0+D3nHGfWhixmPAF09afUWlow2RGMZlPKtEZ27x
 wKEV6uxBjGrQoBKIkM1INwB6PzcYsoxwMVDfIzIiGU3Ck/59yVmKqT2UfaqkneXC
 poGA9FZ2eeSmh/0fxPue4gDRNYW5f7rjzjjf+x5kKTJi8+G5dX9TpaZhDd7cwvAy
 U0hnBWz6P3x0XRDzAAIuUeZP2S9JzedXbBKgAE3447r8MNH74TRA2y07ERpakS45
 DpyfepUcueEs9EMSgW/gPbG79cbdA9AiK9dPFVGchlvyk8eUD0KCRoBBPCuv99Z6
 mQzcSrQ7XBJV4zq7zomlsL9ERd8R9DjgF89ZWUeiQKbFFxceldkclaVX7s5m2H5h
 HzHYTKKNhcP+ZBwoX/IabRhE/N6hNMDKsrnz2GllVHfpocWRJXOZYnosVI/AS/iR
 5lLwIdsX6EQYHX1ZrVR8ROJ3R0ft52kNwS6bKt10hor0D/Y5DVpb2i9D34uYMjPj
 QBAIwd4yXIJhBwv+ldHp
 =gI+4
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.13/display-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

I accidentally removed some mux code for omap4 that I thought was
dead code as omap4 has been booting with device tree only since
v3.10. Turns out I also removed some display related mux code,
so let's revert that except for the dead code parts.

* tag 'omap-for-v3.13/display-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (439 commits)
  Revert "ARM: OMAP2+: Remove legacy mux code for display.c"
  +Linux 3.13-rc4
2013-12-20 08:30:50 -08:00
Thierry Reding
cb99fd6200 ARM: tegra: Enable DRM panel support
Enable DRM panel core support along with support for various simple
panels.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
2013-12-19 13:08:21 -07:00
Laurent Pinchart
b58c8e7b43 ARM: shmobile: mackerel: Fix USBHS pinconf entry
Fix a typo in the USBHS1 pinconf entry that prevented the pull-down from
being enabled.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-19 19:08:27 +09:00
Laurent Pinchart
1d2bdbc3a8 ARM: shmobile: Let Koelsch multiplatform boot with Koelsch DTB
Let the multiplatform Koelsch support boot with the legacy DTS for
Koelsch as well as the Koelsch reference DTS.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-19 19:08:27 +09:00
Laurent Pinchart
1fb68146d5 ARM: shmobile: Let Lager multiplatform boot with Lager DTB
Let the multiplatform Lager support boot with the legacy DTS for Lager
as well as the Lager reference DTS.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-19 19:08:26 +09:00
Laurent Pinchart
469cd76b53 ARM: shmobile: Remove non-multiplatform Koelsch reference support
Now that r8a7791 has CCF support remove the legacy Koelsch reference
Kconfig bits CONFIG_MACH_KOELSCH_REFERENCE for the non-multiplatform
case.

Starting from this commit Koelsch board support is always enabled via
CONFIG_MACH_KOELSCH, and CONFIG_ARCH_MULTIPLATFORM is used to select
between board-koelsch.c and board-koelsch-reference.c

The file board-koelsch-reference.c can no longer be used together with
the legacy sh-clk clock framework, instead CCF is used.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
[horms+renesas@verge.net.au: Dropped arch/arm/boot/dts/Makefile portion]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-19 19:08:26 +09:00
Laurent Pinchart
a8325d627f ARM: shmobile: Remove non-multiplatform Lager reference support
Now that r8a7790 has CCF support remove the legacy Lager reference
Kconfig bits CONFIG_MACH_LAGER_REFERENCE for the non-multiplatform
case.

Starting from this commit Lager board support is always enabled via
CONFIG_MACH_LAGER, and CONFIG_ARCH_MULTIPLATFORM is used to select
between board-lager.c and board-lager-reference.c

The file board-lager-reference.c can no longer be used together with
the legacy sh-clk clock framework, instead CCF is used.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-19 19:08:26 +09:00
Laurent Pinchart
f31239ef59 ARM: shmobile: koelsch-reference: Instantiate clkdevs for SCIF and CMT
Now that the common clock framework is supported, the clock lookup
entries in clock-r8a7791.c are not registered anymore. Devices must
instead reference their clocks in the device tree. However, SCIF and CMT
devices are still instantiated through platform code, and thus need a
clock lookup entry.

Retrieve the SCIF and CMT clock entries by name and register clkdevs for
the corresponding devices. This will be removed when the SCIF and CMT
devices will be instantiated from the device tree.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-19 19:08:25 +09:00
Laurent Pinchart
4a606af20d ARM: shmobile: lager-reference: Instantiate clkdevs for SCIF and CMT
Now that the common clock framework is supported, the clock lookup
entries in clock-r8a7790.c are not registered anymore. Devices must
instead reference their clocks in the device tree. However, SCIF and CMT
devices are still instantiated through platform code, and thus need a
clock lookup entry.

Retrieve the SCIF and CMT clock entries by name and register clkdevs for
the corresponding devices. This will be removed when the SCIF and CMT
devices will be instantiated from the device tree.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-19 19:08:25 +09:00
Laurent Pinchart
e006502126 ARM: shmobile: koelsch-reference: Remove duplicate CCF initialization
The common clock framework is initialized in the rcar_gen2_init_timer()
function, remove the of_clk_init() call.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-19 19:08:25 +09:00
Laurent Pinchart
0ef3cde4d9 ARM: shmobile: lager-reference: Enable multiplaform kernel support
Enable multiplaform ARM architecture support for the Lager reference
board. Common clock framework initialization will be handled by the
rcar_gen2_init_timer() call, we just need to remove the legacy clock
code initialization.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-19 19:08:25 +09:00
Laurent Pinchart
9a3beb04ec ARM: shmobile: armadillo: Set backlight enable GPIO
The Armadillo 800 EVA panel module has a backlight enable signal
connected to GPIO 61. Instead of requesting the GPIO in board code and
setting it to a high level unconditionally, pass the GPIO number to the
PWM backlight driver as the backlight enable GPIO.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-19 19:08:25 +09:00
Sergei Shtylyov
974faba705 ARM: shmobile: Koelsch: add Ether support
Register Ether platform device and pin data on  the  Koelsch board.
Register platform fixup for Micrel KSZ8041 PHY, just like on the Lager board.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-19 19:08:24 +09:00
Laurent Pinchart
784c33a0c9 ARM: shmobile: koelsch: Add DU device
Only the LVDS output is currently supported.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-19 19:08:24 +09:00
Simon Horman
70d4f2e557 Merge branch 'heads/soc2' into boards2-base 2013-12-19 19:08:11 +09:00
Wolfram Sang
250d829f68 arm: shmobile: clks: remove duplicated clock from r7s72100
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-19 18:21:57 +09:00
Simon Horman
559cec66f1 ARM: shmobile: koelsch: Do not disable CONFIG_{INOTIFY_USER,UNIX} in defconfig
CONFIG_INOTIFY_USER and CONFIG_UNIX are required for udev to function.
This change brings the koelsch defconfig into line with
other shmobile defconfigs.

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-19 18:06:13 +09:00
Simon Horman
5dfdf53358 ARM: shmobile: koelsch: Enable CONFIG_PACKET in defconfig
CONFIG_PACKET is required for the ISC dhcpd daemon function.
This change brings the koelsch defconfig into line with
other shmobile defconfigs.

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-19 18:06:09 +09:00
Simon Horman
8967136000 ARM: shmobile: koelsch: Conditionally select MICREL_PHY
The koelsch board uses has an SH ethernet controller which uses a Micrel
phy. Select MICREL_PHY for koelsch if SH_ETH is enabled to make use of the
Micrel-specific phy driver rather than relying on the generic phy driver.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-19 18:03:53 +09:00
Laurent Pinchart
4b5c211f9f ARM: shmobile: rcar-gen2: Initialize CCF before clock sources
When CONFIG_COMMON_CLOCK is enabled, call rcar_gen2_clocks_init() in the
timer init function to initialize the common clock framework before
initializing the clock sources. This will take care of clock
initialization when the r8a779[01] boards will be switched to
multiplatform kernels.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-19 16:34:05 +09:00
Laurent Pinchart
924370cb4d ARM: shmobile: armadillo800eva: Enable backlight control in defconfig
The backlight is controlled by a PWM signal generated by the TPU.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-19 15:13:05 +09:00
Tomi Valkeinen
130f769e81 Revert "ARM: OMAP2+: Remove legacy mux code for display.c"
Commit e30b06f4d5 (ARM: OMAP2+: Remove
legacy mux code for display.c) removed non-DT DSI and HDMI pinmuxing.
However, DSI pinmuxing is still needed, and removing that caused DSI
displays not to work.

This reverts the DSI parts of the commit.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2013-12-17 16:28:34 -08:00
Kevin Hilman
c38183c833 Make omap2420 and 2430 boot in device tree only mode and prepare things
for removing omap3 legacy booting support.
 
 We can make omap2420 and 2430 boot in device tree only mode by keeping
 board-n8x0.c around until Menelaus has device tree and regulator support
 so devices still work. For the omap2430-sdp we have omap2430-sdp.dts,
 and there's also a minimal support for H4 in omap2420-h4.dts.
 
 For omap3, let's not drop the legacy platform booting quite yet so
 people have a little time to update their booting system.
 
 With the fixes going into v3.13, thing should behave pretty much the
 same way for legacy booting and device tree based booting for omap3.
 
 So people using omap3 based boards, please update your systems to
 boot in device tree mode as omap3 is the last SoC in mach-omap2
 that boots in the legacy mode.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJSp27yAAoJEBvUPslcq6Vz5GcQAMFZwVcwYq1szKDDeZNhDaoK
 HQK3DPbh7zWlRAmNQhr4LVqy7IGlYiaPGvsG5BBsiXVNt0nxM90SREx42j2zpAwG
 yH8SXRlDKvHCP/hbRYUjfiG4H8y7TqHWklSxWWQ0qQ63316Pngg2ppzCizlYP5Kz
 ACKETyORUJbCBmcw9XwHP7+lCa1feBq4U8nEdT7OMOfzHn5rGNqrslEHtpqbm6dp
 XgEYN+reDDTUPaoAW+knURgERASsqx/o0YZWQ4OeImAuxtD0Dk0V5PeCEYiCDqLQ
 nJpZlqhWDeo/llfbY7T1gL3Fr70+uYSed3iE8YfVkfC235cadd8nhw11K5hNyyvT
 xv+n5meS7762HOIh9nZ9sGi4vW6B3HbpL39tRW1fIKT8LQ46BL0LpfhnWdcsUHKZ
 9OmCiBM9hkB/s3a+3zYGpry1rrdHe9l6KIm701yWmmk70cCl8ELGJutvG5qWurNb
 lFxy6+ZtuSCvAsa3H5KtJJGiKZs5A2IEOIuEUL3XnbJPGUSz3Rj7jMr0NS7fPYhB
 jK5vfguz+ok01pi304AbNzVvv3Fothb3lff5JjWK8C9WuipA8lPWdKP/pcqVdA7P
 OnqdXqgx5d4efykvN5WQN67AfjXXj0nzB3v17xF3Y31APZ/O7T7XTNFGybXgNKgf
 8SN7JJejgiI3deWdltnz
 =uez2
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.14/board-removal-safe' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards

From Tony Lindgren:
Make omap2420 and 2430 boot in device tree only mode and prepare things
for removing omap3 legacy booting support.

We can make omap2420 and 2430 boot in device tree only mode by keeping
board-n8x0.c around until Menelaus has device tree and regulator support
so devices still work. For the omap2430-sdp we have omap2430-sdp.dts,
and there's also a minimal support for H4 in omap2420-h4.dts.

For omap3, let's not drop the legacy platform booting quite yet so
people have a little time to update their booting system.

With the fixes going into v3.13, thing should behave pretty much the
same way for legacy booting and device tree based booting for omap3.

So people using omap3 based boards, please update your systems to
boot in device tree mode as omap3 is the last SoC in mach-omap2
that boots in the legacy mode.

* tag 'omap-for-v3.14/board-removal-safe' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (299 commits)
  ARM: dts: Add basic devices on am3517-evm
  ARM: OMAP2+: Use pdata quirks for emac on am3517
  ARM: OMAP2+: Add support for legacy auxdata for twl
  ARM: dts: Fix booting for secure omaps
  ARM: OMAP2+: Fix the machine entry for am3517
  ARM: dts: Fix missing entries for am3517
  ARM: OMAP2+: Fix overwriting hwmod data with data from device tree
  +Linux 3.13-rc3

Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-12-17 14:12:25 -08:00
Tomasz Figa
cb12057256 ARM: s3c64xx: dt: Fix boot failure due to double clock initialization
Commit

4178bac ARM: call of_clk_init from default time_init handler

added implicit call to of_clk_init() from default time_init callback,
but it did not change platforms calling it from other callbacks, despite
of not having custom time_init callbacks. This caused double clock
initialization on such platforms, leading to boot failures. An example
of such platform is mach-s3c64xx.

This patch fixes boot failure on s3c64xx by dropping custom init_irq
callback, which had a call to of_clk_init() and moving system reset
initialization to init_machine callback. This allows us to have
clocks initialized properly without a need to have custom init_time or
init_irq callbacks.

Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-13 21:48:25 -08:00
Ben Dooks
7e429989b6 ARM: shmobile: Add select MIGHT_HAVE_PCI for PCI-AHB bridge code
The PCI sub-system is not enabled by default on ARM and on certain
Renesas devices the build does not select it. This means that there
are configurations that do not allow the AHB-PCI bridge used for the
USB sub-systems to be built.

For the R8A7790, R8A7791 and EMEV-2 select MIGHT_HAVE_PCI to allow the
PCI drivers to be built. Also select MIGHT_HAVE_PCI for the multi-config
where there may be many Reneasas devices selected.

Reviewed-by: Ian Molton <ian.molton@codethink.co.uk>
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-14 10:46:25 +09:00
Linus Torvalds
b2077ebc19 Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
 "This resolves some further issues with the dma mask changes on ARM
  which have been found by TI and others, and also some corner cases
  with the updates to the virtual to physical address translations.

  Konstantin also found some problems with the unwinder, which now
  performs tighter verification that the stack is valid while unwinding"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: fix asm/memory.h build error
  ARM: 7917/1: cacheflush: correctly limit range of memory region being flushed
  ARM: 7913/1: fix framepointer check in unwind_frame
  ARM: 7912/1: check stack pointer in get_wchan
  ARM: 7909/1: mm: Call setup_dma_zone() post early_paging_init()
  ARM: 7908/1: mm: Fix the arm_dma_limit calculation
  ARM: another fix for the DMA mapping checks
2013-12-13 16:16:03 -08:00
Russell King
b713aa0b15 ARM: fix asm/memory.h build error
Jason Gunthorpe reports a build failure when ARM_PATCH_PHYS_VIRT is
not defined:

In file included from arch/arm/include/asm/page.h:163:0,
                 from include/linux/mm_types.h:16,
                 from include/linux/sched.h:24,
                 from arch/arm/kernel/asm-offsets.c:13:
arch/arm/include/asm/memory.h: In function '__virt_to_phys':
arch/arm/include/asm/memory.h:244:40: error: 'PHYS_OFFSET' undeclared (first use in this function)
arch/arm/include/asm/memory.h:244:40: note: each undeclared identifier is reported only once for each function it appears in
arch/arm/include/asm/memory.h: In function '__phys_to_virt':
arch/arm/include/asm/memory.h:249:13: error: 'PHYS_OFFSET' undeclared (first use in this function)

Fixes: ca5a45c06c ("ARM: mm: use phys_addr_t appropriately in p2v and v2p conversions")
Tested-By: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2013-12-13 20:25:30 +00:00
Stephen Warren
0d8c67218c ARM: tegra: tegra_defconfig updates
Add some features to tegra_defconfig:
* Tegra+MAX98090 audio machine driver, as used on the Venice2 board.
* AMX3722 PMIC, as used on the Venice2 board.
* ChromeOS embedded controller, for the Venice2 keyboard.

Also, rebuild tegra_defconfig on a more recent kernel (3.13-rc1) to
minimize irrelevant diffs showing up when people edit the file.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
2013-12-13 12:35:50 -07:00
Ezequiel Garcia
4427944b71 ARM: mvebu: config: Enable NAND support
Enable the pxa3xx-nand driver, which now supports the NAND controller
in Armada 370/XP SoC.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-12-12 14:07:34 +00:00
Kuninori Morimoto
aa9938644c ARM: shmobile: r8a7778: add USB Func DMAEngine support
HPB-DMAC has 2 channel for USB Func (= D0/D1)
D0 is used as Tx, D1 is used as Rx on this patch

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-12 22:02:14 +09:00