IF YOU WOULD LIKE TO GET AN ACCOUNT, please write an
email to Administrator. User accounts are meant only to access repo
and report issues and/or generate pull requests.
This is a purpose-specific Git hosting for
BaseALT
projects. Thank you for your understanding!
Только зарегистрированные пользователи имеют доступ к сервису!
Для получения аккаунта, обратитесь к администратору.
this patch is againest v4.2-rc1, by doing:
$ make ARCH=arm prima2_defconfig
$ make ARCH=arm savedefconfig
$ cp defconfig arch/arm/configs/prima2_defconfig
Signed-off-by: Barry Song <Baohua.Song@csr.com>
It is useful to know how the kernel was configured via:
zcat /proc/config.gz ,so select the CONFIG_IKCONFIG_PROC option.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Enable the RPM and RPM regulator drivers as well as the KS8851
ethernet driver so that ethernet works on MSM8960 CDP.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Andy Gross <agross@codeaurora.org>
SPI NOR, CPTS, touchscreen and ADC used on am335x, am437x
and ra7 devices.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJVr0MrAAoJEBvUPslcq6VzLz0QANyBa9ImByiFEYyIMn3wTq0Z
cVbigbC0wiYv8qtPg/rgcg8qSb/L5qzLa0Ulk5b/gZj6AdnS94Q1KqwmYlad92Dx
+iuUwhGjN4US1P6X+jLfiNDGdtzK3HAMycUU8+4eoGPYH9dHh6I1W8JHI+1PFGuK
z4bZIb0HOCi06XcQrX0CUEBoJVulhS+vbsClrCq0sjqFYm3r0zt6DzKd32P0UbyR
Dk21WkebJ9TBrmU/yFh+o0ndIeQj43x/Q3Vqkoq2VRpokXJXE/lfPVsDoNlEobvU
BysBVdZomMabV2+kANSgLJIiMb5Yj/2LHsED/VnU1wwvbE5wFJmft0Ryk2tdg3Z9
p1X+z3fJyMJLRQis+w1oFoS0H7SVDD1Nbnrj+OGdZSFDV/mj52TxRdihS59RYtEy
H/TgtdYDiKgai6K+t+Oy58zBLT5b07/q6PJ95d3SlXnmx/XxuO58wmLXTwT7Z4yk
98G67+1xDbRC9sN596dM479t/zqi9IeRztQOKiMPQpV8rlXIPo3CvZ9izPHu3aV/
UFC54yJRJHBCnmh9gFKZNEHyiEec4tKmsllUH8EO+5IaF0eytPwxuMzeSvGCWWqV
oXYyObH2k10V8C4pgenbNPqETanTe9CfngzS9aWmi53FUHNCPlxPHCyqKKjFCmxg
Shv01gA1ZbH6E/QhcJDX
=jALL
-----END PGP SIGNATURE-----
Merge tag 'omap-for-v4.3/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/defconfig
Merge "defconfig changes for v4.3" from Tony Lindgren:
Few defconfig changes for omap2plus_defconfig to enable
SPI NOR, CPTS, touchscreen and ADC used on am335x, am437x
and ra7 devices.
* tag 'omap-for-v4.3/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: omap2plus_defconfig: enable support for M25P80 SPI NOR
ARM: omap2plus_defconfig: enable support for TI CPTS
ARM: omap2plus_defconfig: enable support for TI touchscreen
ARM: omap2plus_defconfig: enable support for TI ADC
Signed-off-by: Olof Johansson <olof@lixom.net>
resolution timers, and to by default enable and compile
all board variants now that we can have a single kernel,
and enable all EP93xx-specific drivers that sit in various
sites across the kernel.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJVqNFLAAoJEEEQszewGV1zzmsP+gNi6uiVuHFSChs+eGnS/GVT
I/M57BVMoWO30WiqpfR9yihmfDmZc65LVZ4pmkfUNLMVuDvrJ/6/MaiSPmcrUzwC
3NC7H8aVypjx6k/9r8XS7tA2sVUkN61LCKuQu2PhlLWRLH0YEmXMpHkCP38iLe8B
QQ/D3k1coq5OlzG6juz9jMJXlaBPw+bVNQ4ZceRs+WnE3FWW7243K/PTGG7Na6c/
dcMO49WJJ0Q2QqVvLPE3RN/m3KWm+DD+2aiu5DTmhZ4VqGCTWokjQG4u2XAvdKdG
CFGkzm4sP+uv+ubjGxjhcAkQwCNKvvfrXPx6tCfC6x1ywW9tN5y1ATdNszy4hv96
J/HNULVAbf01E5sWiB15MNCIQKGRa31jss2NQfXrhLEHrT9ujxqm+P5cmlzvWQas
ILEXEmd1n/XjMYox0TXMsoclxiK4U583l6xcaR47twRevpQl6qvvF09YPaKSdz7G
FW8BY2N2gChiUGcLtzFfTuHc7D9ULuvhX6U+27lPi9ADEca+w96y0ELmRL4cdq6Q
wsubxcHaAoDID6UnoG2G1MBkm0XLI7UlCulIoHgw90alUKVBWZHkXddILu5E/b/z
pmVVzrXb1tTp25byZJLtG/5ZUUvnmMHYv9u9zKrssLV6OaWSvPPTPwzcE6bxjIsX
vbzorh6r+8E000voyJwd
=ebxc
-----END PGP SIGNATURE-----
Merge tag 'ep93xx-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/defconfig
Merge "EP93xx defconfig changes" from Linus Walleij:
This updates the EP93xx defconfig to use NO_HZ and high
resolution timers, and to by default enable and compile
all board variants now that we can have a single kernel,
and enable all EP93xx-specific drivers that sit in various
sites across the kernel.
* tag 'ep93xx-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
ARM: ep93xx: add framebuffer to the defconfig
ARM: ep93xx: add DMA engine to the defconfig
ARM: ep93xx: add GPIO I2C to defconfig
ARM: ep93xx: add LEDs and triggers to defconfig
ARM: ep93xx: enable SIM.ONE MMC/SD hardware
ARM: ep93xx: enable all boards in the EP93xx defconfig
ARM: ep93xx: activate NO_HZ and high-res timers
Signed-off-by: Olof Johansson <olof@lixom.net>
update mvebu_v7_defconfig with features needed for Armada 388 GP
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAlWoKuAACgkQCwYYjhRyO9XPuACfbqntlfTFA3ZMSchcFfWTuv9B
vfUAn2bvhZGk8ug2XTumCwDXlnkfovND
=VRBf
-----END PGP SIGNATURE-----
Merge tag 'mvebu-config-4.3-1' of git://git.infradead.org/linux-mvebu into next/defconfig
Merge "ARM: mvebu: config changes for v4.3" from Gregory Clement:
mvebu config changes for v4.3 (part #1)
update mvebu_v7_defconfig with features needed for Armada 388 GP
* tag 'mvebu-config-4.3-1' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: update mvebu_v7_defconfig with features needed for Armada 388 GP
Signed-off-by: Olof Johansson <olof@lixom.net>
The EP93xx SoC has a framebuffer driver, let's add this to the
defconfig so we can have graphics working out of the box.
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Several boards can make use of the DMA engine on the EP93xx
so let's enable this by default in the defconfig.
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Some of the EP93xx boards have I2C devices on bit-banged GPIO
I2C, so add this to the defconfig.
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
The EP93xx has two designated LEDs (not always connected): a
green and a red one. These are registered in the core, so let's
enable the driver and some triggers.
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
The SIM.ONE has a MMC card connected to the SPI host. This card
usually hosts an EXT4 root file system. Enable these options in
the defconfig so the default ompiled kernel will work
out-of-the-box.
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
With PATCH_PHYS_TO_VIRT we can support all EP93xx variants
in a single image, so enable all board variants in the defconfig
for simplicity and build coverage.
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Let's set the EP93xx to NO_HZ mode and activate the high-res
timers now that we have GENERIC_CLOCKEVENTS.
Tested-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Now when the Marzen legacy board code is removed also
get rid of the marzen_defconfig file. Existing users
shall move over to shmobile_defconfig.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
M25P80 driver provides support for most common SPI NOR devices.
These devices are commonly found on TI EVMs for AM437x and DRA7x
SoCs.
Enable support for this driver in defconfig for omap2plus devices.
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
CPTS module of CPSW IP enables timestamp synchronization
using PTP. Enable CPTS feature of CPSW driver.
Available on AM335x, AM437x and DRA7x SoCs.
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Acked-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Enable support for on-chip resistive touchscreen m found on AM335x and
AM437x devices.
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Enable support for on-chip ADC found on AM335x and
AM437x devices.
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This patch enables Renesas DPCM related sound card.
It is used for...
- Sampline rate convert
- CTU/MIXer
Note: you need to enable these settings on DTS file
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This patch enables DPCM related sound card.
It is used for...
- Sampline rate convert
- CTU/MIXer
Note: you need to enable these settings on DTS file
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
More and more boards are moving to have audio support via simple-card.
At the same time enable options needed for most am335x and am43xx board for
audio support: McASP and TLV320AIC3X codecs.
The later two has been selected by the CONFIG_SND_AM33XX_SOC_EVM option, but
the aim is to convert all boards to use simple card.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
* Remove non-multiplatform code from timer
* Remove CONFIG_ARCH_SHMOBILE_MULTI check in setup-rcar-gen2.c
as it is always true
* Remove legacy (non-multiplatform) support for both sh73a0/kzm9g and
r8a7740/armadillo800eva
* Move to_rmobile_pd from header to source file where it is used
* Use BIT() macro instead of open coding in r-mobile PM code
* r8a7779: Remove usage of GENPD_FLAG_PM_CLK flag which has no effect
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJVn2XkAAoJENfPZGlqN0++bO4P/j/+2rQYeWfYbeLmlKe0T77I
Js4e+7y6El0wrFaWHWPwtoYVmjiXxpFxFU6PHw0oiLzaiwE6KKDsLsi/mnL+Cv4G
aA7Yj0Rq/Z6N5/Jk6MVNPVlJeRUVqFamokcitWiwMIC+uXGbkfElVNzJh5ssT9pY
IFzstvIZ4kvN0nugxwcIe06E5reacpdOgvLQ5oUo1kDj6HNqcQZ3rqahNnbJ/3If
0SgP/Koi1mY4/Mr8Xs61kvgW7xRFONVtuMpSe6PmpsGiNz+jpIJkdp43SYb92zsB
K+4lBiXBznsgW1FTMh5rUycjp4v1shFKTaczFqZkGa0hN35J/i4E30fslC89MOdY
wAM/HxJJgCSD6jV+vpdZ6PZo93e+E2lz/Upk1P018+OJb7NAWiFQoVFYnp2XUl+S
x0Hah2I4qH5vLzPd5kLiySMoU4+bdyNd8bQUR5XEJznb9eTqBuPao0Bz8I60ICm5
6pWglIvRy/hPYWlBBKPEYO6/XU6gysVEDUm7I9I8xFv8DJHolOhS/FTn+A1LeOrv
nodOtGR83D6jkmeXAhd1XtmB6XbcbW7/G5wfUssh4hNZ3yp1Eanv8Hlx1WRkPy+A
zLdBjBM33TJToh/EJhAMDXX88SFYtIVyHbLAk84ZeRSj3Oc82Wwqv5drODRhOlzq
CZto28iqHnFz2QoaeYP5
=2lyB
-----END PGP SIGNATURE-----
Merge tag 'renesas-cleanup-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
Merge "Renesas ARM Based SoC Cleanup for v4.3" from Simon Horman:
* Remove non-multiplatform code from timer
* Remove CONFIG_ARCH_SHMOBILE_MULTI check in setup-rcar-gen2.c
as it is always true
* Remove legacy (non-multiplatform) support for both sh73a0/kzm9g and
r8a7740/armadillo800eva
* Move to_rmobile_pd from header to source file where it is used
* Use BIT() macro instead of open coding in r-mobile PM code
* r8a7779: Remove usage of GENPD_FLAG_PM_CLK flag which has no effect
* tag 'renesas-cleanup-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: timer: r8a73a4 and r8a7790 are multi-platform only
ARM: shmobile: R-Car Gen2: CONFIG_ARCH_SHMOBILE_MULTI is always set
ARM: shmobile: Remove obsolete zboot support
ARM: shmobile: R-Mobile: Remove legacy PM Domain code
ARM: shmobile: Remove unused dma-register.h
ARM: shmobile: Remove legacy SoC code for R-Mobile A1
ARM: shmobile: Drop r8a7740-armadillo800eva.dtb for legacy builds
ARM: shmobile: Remove legacy armadillo800eva_defconfig
ARM: shmobile: Remove legacy board code for Armadillo-800 EVA
ARM: shmobile: Remove legacy SoC code for SH-Mobile AG5
ARM: shmobile: Drop sh73a0-kzm9g.dtb for legacy builds
ARM: shmobile: Remove legacy kzm9g_defconfig
ARM: shmobile: Remove legacy board code for KZM-A9-GT
ARM: shmobile: r8a7779: Remove GENPD_FLAG_PM_CLK flag
ARM: shmobile: R-Mobile: Use BIT() macro instead of open coding
ARM: shmobile: R-Mobile: Move to_rmobile_pd from header to source file
Signed-off-by: Olof Johansson <olof@lixom.net>
The UniPhier on-chip UART driver was merged into the mainline by
commit 1a8d2903cb6a ("serial: 8250_uniphier: add UniPhier serial
driver").
Enable it from multi_v7_defconfig.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
build in snvs powerkey
build in syscon power off support
Signed-off-by: Frank Li <Frank.Li@freescale.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
The old warp board revision had hardware issues that prevented
the RTS/CTS lines to work with the Bluetooth module.
Tha latest rev1.12 fixes this problem, so now we should better use
CONFIG_BT_HCIUART_H4 instead, as it provides a better throughput than
the CONFIG_BT_HCIUART_3WIRE option.
Suggested-by: Arthur Lambert <arthur@dreem.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
A bunch of defconfig changes, and some patches to make the Allwinner H3 and
A33 boot properly.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJVmUC5AAoJEBx+YmzsjxAgc24P/Ah6q+SSSv68adzGQp6LGO8t
ru2OWZwlQn+w2gHJK9qAytmQdpSRqbbjB+8muLz9WwNNjHliDmJawUvBPdC2p03L
ZrugiVUSKBeQOzdqvG0B3vOO3xszDE06DA+i0PZaBWH2uXDVfohhCFQ2n2/oQsS7
eDSlBl1EHtZOKEHtuEi988YDJhYDnJeSG/SWwyUbW73QH5eYYl+9TnSXdwDKGmJS
JyfWkafIsI3EKWUYmOJ2NgUv13pYQU9k/we53n+PxeGevsPuenJH8r2j/N8pWtUl
srfZP82aEYCqlY4M6QL21k2KOPW8MIDMOOk9dh8l8k9nSC2oJXqsROJQpw2nrJRo
oPoT+gxWacc+AutX3Hz+XjXNsCIsE3q0Yd7yBfiszXroPtkIBslJGhdJRbh3VrxO
JS7lKVubJepePpARiWT4ginenWPgGPirDHWixSUcfgBnMN6fpdhOGpdDxWePy1IJ
7wox3lRThnBhhvI1HuLES92XEiRYhin21LA00juPbvCMbQKuG2W9fBryXTi3U3LC
g3RQfy3ViZbrEw/7iTjlm2MVYSRxSdA1SAQHNS5Q+4fem22XKeSlzHON/0izrCdV
10zWNUAlolESWhCyD3TMScFl7WG+KMrjaHE/02+q7wSA6sr1aMGfjL6buVA7R5bF
KiCWz4Sqp8p/a4RejDVl
=m0CY
-----END PGP SIGNATURE-----
Merge tag 'sunxi-late-for-4.2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixes
Merge "Allwinner late changes for 4.2" from Maxime Ripard:
Allwinner late changes for 4.2
A bunch of defconfig changes, and some patches to make the Allwinner H3 and
A33 boot properly.
* tag 'sunxi-late-for-4.2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
ARM: sunxi: Enable simplefb in the defconfig
ARM: Remove deprecated symbol from defconfig files
ARM: sunxi: Add Machine support for A33
ARM: sunxi: Introduce Allwinner H3 support
Documentation: sunxi: Update Allwinner SoC documentation
The Armada 388 GP board has the following hardware features that were
not enabled in mvebu_v7_defconfig:
* An AT24 I2C EEPROM (also used by armada-xp-lenovo-ix4-300d)
* A PCA9555 I2C GPIO expander
* Several fixed regulators
Therefore, this commit adds the necessary options to mvebu_v7_defconfig.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
The legacy board code for Armadillo-800 EVA has been removed.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
The legacy board code for KZM-A9-GT has been removed.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Now that we have simplefb support, we can enable it in our defconfig. Also
enable the framebuffer console, so that we are sure that we actually get
something displayed in any case.
And while we're at it, enable the module support.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Commit b2b3a8b934e6 ("power/reset: Remove sun6i reboot driver") removed
the sun6i reboot driver. But sunxi_defconfig and multi_v7_defconfig
still contain the symbol CONFIG_POWER_RESET_SUN6I that was deprecated
by that commit, so remove it.
Signed-off-by: Timo Sigurdsson <public_timo.s@silentcreek.de>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
The Broadcom NAND driver is used by brcmstb, bcm63xx, bcm5301x and
Cygnus/iProc under mach-bcm, this is enough critical mass to enable it.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
We keep collecting defconfig updates in a separate branch mostly to encourage
people to handle them separately and avoid conflicts between different topics.
Most of these are enablement of new SoCs, boards or drivers that have
come in, or minor config refreshes due to reorderings in Kconfig
files, etc. I.e. mostly minor churn of various kinds.
Conflicts: None
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJVi4RbAAoJEFk3GJrT+8Zl8IkP/3X9+EQrk7zzSEtzpQilWVc+
r6Usx3TwvrXnmFUhy/Vxwc9f+nsn7cuDXo1ms8OeNq3tY94pHINMsgfLQBEYdamu
4A73cy0HwYh5lo4XGEWNYAPP70iCAwHaLY0bFvmRcT3skqA9XeVy2uEe4iGy75fc
tPdfjhFigiFrkeLOa2hy/4h5BkT5adqWFf6IOl+GY13QKdjPBndbeaarHC77bVoM
yxRQMp2cpx/jsNnN4IuAr1RHCtYC+ENz26TdnOiTYhGGtPUTwmF4qNKDUBykGEAu
8AVqpujHt3OvfZKWDcxiv5bXJDRrFQqsQDcdVv8jJ6ynUluXKmCX1sdrzs65uB9s
X7KNtpn8rmDgumaPvJ63oesaZVe2AhTMPFUbq694UPLR9odb/bGyh1ESELlwBqX/
cVgOTlmD0J2j4MwxWgMdFm1JEg3uFOrkXOotD8yes5e2eh9k9Zl/c6l5fz8kWxLf
yQj0gc11vdDiCvmbHWvyhW5B/XVB6qZd9UbbY3kpAsxSigfuLqX66qGfGmXqTa8E
B8DHVQo5leTw+hDMk8ibW1nANXZ28odr3lY2hiUJl0PZg+92Vr7/Gr6eUlJH/1Rh
Zs6g7jWkvarAKr+NfUon0+cXoJIqLYJeOqqLmMpNn8k9qQdsvA4r/rIh0tqh7FQY
Ig5uZEI19xegAtgKG4Ue
=q6ks
-----END PGP SIGNATURE-----
Merge tag 'armsoc-defconfig' into test-merge
ARM: SoC: defconfig updates for v4.2
We keep collecting defconfig updates in a separate branch mostly to encourage
people to handle them separately and avoid conflicts between different topics.
Most of these are enablement of new SoCs, boards or drivers that have
come in, or minor config refreshes due to reorderings in Kconfig
files, etc. I.e. mostly minor churn of various kinds.
Conflicts: None
# gpg: Signature made Wed Jun 24 21:32:27 2015 PDT using RSA key ID D3FBC665
# gpg: Good signature from "Kevin Hilman <khilman@deeprootsystems.com>"
# gpg: aka "Kevin Hilman <khilman@linaro.org>"
# gpg: aka "Kevin Hilman <khilman@kernel.org>"
Our SoC branch usually contains expanded support for new SoCs and
other core platform code. Some highlights from this round:
- sunxi: SMP support for A23 SoC
- socpga: big-endian support
- pxa: conversion to common clock framework
- bcm: SMP support for BCM63138
- imx: support new I.MX7D SoC
- zte: basic support for ZX296702 SoC
Conflicts:
arch/arm/mach-socfpga/core.h
Trivial remove/remove conflict with our cleanup branch.
Resolution: remove both sides
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJVi4RMAAoJEFk3GJrT+8Zl6/kP/1Rv9O++1Kxua6R54Og6AF1J
0miFr2fnUrUWUYg/NVbseRH5bBe6N6ir3SQMfde8W2/QibEjOoEwSwrle+mC/eiq
CE0x0gtyRvXMrMU/FWkOvbmmw9uv5oz1z3IHZV6AiecNuSMLUBPfamryikQ8C+d1
O/QZtX543tJQJDOBihO5cuhoVVM37UX0unNmqGsyswlyqTPF8FxcIJAYVNtnxjmj
AFaOB0nDJKLKFTiX2Ype2wOxxJX1lrLatNo4W4T+YaaK+i1uCOhgTdSN+n49K7YA
KNDFEgZFQqT8VMJyG+eJVeYF+cI7yWQ7lBzIftPUjPk/7+dIHBjWPz2QdjVz3U38
kxncf4S9xGAF5G2rcKe4mFrfT3Y8QLWQpA/jFs06yLwW1O3Hlfq3DzMdGNcF7hth
17LOP8namn9+NepZEp/vAlFzRRypxWWtbkPNBIItkImC6zn0IiGjBy50DE1io27W
hmQcnMb7d+0wWl2Y8OmR2lZSB97JiRZkRYMCVHVt+0zGJzp4prLvl9wbjh1VXkPv
ERCDJ9nCmZsl7ZVmIXMI7KNXYuPNp7R/QAzCvuSUueswF0qxTAQ0VSSBwRMqvQsQ
UUNC6p63VnjUeMUdn2EBsUQZ0Uqw3t2U5TtvooHNt9FkiGsSpwjWrvVD+LItaPoJ
GPeeJrJaYQsDvTrO8wjU
=ZtPK
-----END PGP SIGNATURE-----
Merge tag 'armsoc-soc' into test-merge
ARM: SoC: platform support for v4.2
Our SoC branch usually contains expanded support for new SoCs and
other core platform code. Some highlights from this round:
- sunxi: SMP support for A23 SoC
- socpga: big-endian support
- pxa: conversion to common clock framework
- bcm: SMP support for BCM63138
- imx: support new I.MX7D SoC
- zte: basic support for ZX296702 SoC
Conflicts:
arch/arm/mach-socfpga/core.h
Trivial remove/remove conflict with our cleanup branch.
Resolution: remove both sides
# gpg: Signature made Wed Jun 24 21:32:12 2015 PDT using RSA key ID D3FBC665
# gpg: Good signature from "Kevin Hilman <khilman@deeprootsystems.com>"
# gpg: aka "Kevin Hilman <khilman@linaro.org>"
# gpg: aka "Kevin Hilman <khilman@kernel.org>"
# Conflicts:
# arch/arm/mach-socfpga/core.h
commit dcf9a03bff4e (ARM: multi_v7_defconfig: Enable PMIC and MUIC
drivers for exynos) mistakenly added an duplicate line for
CONFIG_COMMON_CLK_QCOM=y. Remove it.
Signed-off-by: Kevin Hilman <khilman@linaro.org>
- Enable dm9000 as built-in for NFSroot
- Enable dm816x USB phy as a loadable module
- Enable Pixcir touch screen as a loadable module
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJVbcpQAAoJEBvUPslcq6Vz1L0QAJ6zg+8ENi5UsAfnGz0rcFjk
fvdkdSk4d1bHjp6z8fjgmeRLfphJ04HOOkMqAzIRhlEKAeVEPHA5qc+GC2+Ag03I
GUh4fclNrsmlwRU/vnxSSSAfnROWBrZV5Zy/XG1fW4mF0WzFIiPMR1OWXXxrnSKp
MJwip5kGtVyhyEqQ3F4oTMG657M8UtOExX+uRSfsdaXtw41PNFd2QxphDbnM396R
rmEa+S5nw6A4onlORXzs6SAMScYMFycZhUYVQtEL/WywVa/6GOMqBFWx9fVAs5R0
lf+ykr0jMa5a8iLmCBti3+RPzEZMkCpSH3qqvR7sr14weX0zO1kpWeMkny8JA2si
4oNu+vv8FAgi1YhYh9t/r9jSoUaHhS8FI/hiiLAXs0Zc+q/XCaGOYOJQvWFe7IHt
SBTzt0E8sPMHUllT4mJTeODC6c/fq8XK1bFctwTF3DOcDrSc+cpbf6q17eVmzj+k
W0iSk7tiWsOVYTLWkhlPTMBJ4FQD3DwJTTfQjAzYOyaPUh7In5K6cf+ScRECBCbB
d1HLMnf7/MGmH2xtxRAyzw2ZcTIyxKn2teJxECPzOXlq87jdNdtdO1DXYkpFJN+y
wpzJwNKvLOQzWWuluNJOtDXDb/rCdprD17O5JYNmfUCNnqy78nSSmhkQ4xaEV87Y
Cq+d5tKqOzyWuDaF51BS
=QPe9
-----END PGP SIGNATURE-----
Merge tag 'omap-for-v4.2/o2_dc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/defconfig
Few omap2plus_defconfig changes for v4.2 merge window:
- Enable dm9000 as built-in for NFSroot
- Enable dm816x USB phy as a loadable module
- Enable Pixcir touch screen as a loadable module
* tag 'omap-for-v4.2/o2_dc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: omap2plus_defconfig: Enable TOUCHSCREEN_PIXCIR
ARM: omap2plus_defconfig: Add dm816x USB PHY as a loadable module
ARM: omap2plus_defconifg: Enable DM9000 in omap2plus_defconfig
