Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162516AbbKTLqy (ORCPT ); Fri, 20 Nov 2015 06:46:54 -0500 Received: from down.free-electrons.com ([37.187.137.238]:37630 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1161383AbbKTLqx (ORCPT ); Fri, 20 Nov 2015 06:46:53 -0500 Date: Fri, 20 Nov 2015 12:46:37 +0100 From: Maxime Ripard To: Timo Sigurdsson Cc: wens@csie.org, tyler.baker@linaro.org, info@gerhard-bertelsmann.de, plaes@plaes.org, rafael.j.wysocki@intel.com, linux@arm.linux.org.uk, carlo@caione.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com Subject: Re: [PATCH] ARM: sunxi: Re-enable SID driver in sunxi_defconfig Message-ID: <20151120114637.GB32142@lukather> References: <1447724578-4786-1-git-send-email-public_timo.s@silentcreek.de> <1447969715.1730.5.camel@silentcreek.de> <20151119234331.GT32142@lukather> <1447981788.1404.23.camel@silentcreek.de> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="WxezjuMNsgvRf6mf" Content-Disposition: inline In-Reply-To: <1447981788.1404.23.camel@silentcreek.de> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5498 Lines: 155 --WxezjuMNsgvRf6mf Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Nov 20, 2015 at 02:09:48AM +0100, Timo Sigurdsson wrote: > Hi Maxime, >=20 > Am Freitag, den 20.11.2015, 00:43 +0100 schrieb Maxime Ripard: > > Hi, > >=20 > > On Thu, Nov 19, 2015 at 10:48:35PM +0100, Timo Sigurdsson wrote: > > > Hi Maxime, > > > Hi Chen-Yu, > > >=20 > > > Am Dienstag, den 17.11.2015, 02:42 +0100 schrieb Timo Sigurdsson: > > > > Commit 3d0b16a66c8a ("nvmem: sunxi: Move the SID driver to the > nvmem > > > > framework") moved the the sunxi SID driver to a new framework, but > left > > > > sunxi_defconfig with the deprecated config symbol EEPROM_SUNXI_SID > > > > instead of the new symbold NVMEM_SUNXI_SID. Hence, re-enable the > driver > > > > in sunxi_defconfig. > > > >=20 > > > > While at it, clean up sunxi_defconfig by generating a fresh file > via > > > > make sunxi_defconfig > > > > make savedefconfig > > > > While this moves around a few lines and removes unnecessary > symbols, > > > > it doesn't introduce any functional changes. > > > >=20 > > > > Signed-off-by: Timo Sigurdsson > > > >=20 > > > > diff --git a/arch/arm/configs/sunxi_defconfig > b/arch/arm/configs/sunxi_defconfig > > > > index 3c36e16..904ea52 100644 > > > > --- a/arch/arm/configs/sunxi_defconfig > > > > +++ b/arch/arm/configs/sunxi_defconfig > > > > @@ -11,14 +11,12 @@ CONFIG_SMP=3Dy > > > > CONFIG_NR_CPUS=3D8 > > > > CONFIG_AEABI=3Dy > > > > CONFIG_HIGHMEM=3Dy > > > > -CONFIG_HIGHPTE=3Dy > > > > CONFIG_ARM_APPENDED_DTB=3Dy > > > > CONFIG_ARM_ATAG_DTB_COMPAT=3Dy > > > > CONFIG_CPU_FREQ=3Dy > > > > CONFIG_CPUFREQ_DT=3Dy > > > > CONFIG_VFP=3Dy > > > > CONFIG_NEON=3Dy > > > > -CONFIG_PM=3Dy > > > > CONFIG_NET=3Dy > > > > CONFIG_PACKET=3Dy > > > > CONFIG_UNIX=3Dy > > > > @@ -37,7 +35,6 @@ CONFIG_CAN_SUN4I=3Dy > > > > # CONFIG_WIRELESS is not set > > > > CONFIG_DEVTMPFS=3Dy > > > > CONFIG_DEVTMPFS_MOUNT=3Dy > > > > -CONFIG_EEPROM_SUNXI_SID=3Dy > > > > CONFIG_BLK_DEV_SD=3Dy > > > > CONFIG_ATA=3Dy > > > > CONFIG_AHCI_SUNXI=3Dy > > > > @@ -63,11 +60,10 @@ CONFIG_STMMAC_ETH=3Dy > > > > # CONFIG_INPUT_MOUSEDEV is not set > > > > # CONFIG_INPUT_KEYBOARD is not set > > > > # CONFIG_INPUT_MOUSE is not set > > > > -CONFIG_INPUT_MISC=3Dy > > > > -CONFIG_INPUT_AXP20X_PEK=3Dy > > > > CONFIG_INPUT_TOUCHSCREEN=3Dy > > > > -CONFIG_KEYBOARD_SUN4I_LRADC=3Dy > > > > CONFIG_TOUCHSCREEN_SUN4I=3Dy > > > > +CONFIG_INPUT_MISC=3Dy > > > > +CONFIG_INPUT_AXP20X_PEK=3Dy > > > > CONFIG_SERIAL_8250=3Dy > > > > CONFIG_SERIAL_8250_CONSOLE=3Dy > > > > CONFIG_SERIAL_8250_NR_UARTS=3D8 > > > > @@ -123,6 +119,8 @@ CONFIG_PWM=3Dy > > > > CONFIG_PWM_SUN4I=3Dy > > > > CONFIG_PHY_SUN4I_USB=3Dy > > > > CONFIG_PHY_SUN9I_USB=3Dy > > > > +CONFIG_NVMEM=3Dy > > > > +CONFIG_NVMEM_SUNXI_SID=3Dy > > > > CONFIG_EXT4_FS=3Dy > > > > CONFIG_VFAT_FS=3Dy > > > > CONFIG_TMPFS=3Dy > > >=20 > > > Would you also prefer to see this patch split up into two patches > (one > > > for re-enabling the SID driver and one for the extra cleanup of > > > sunxi_defconfg) as I was asked to do for my other patch for > > > multi_v7_defconfig? > >=20 > > Yes, please do. >=20 > Ok. >=20 > >=20 > > Also why CONFIG_PM CONFIG_KEYBOARD_SUN4I_LRADC and CONFIG_HIGHPTE got > > removed ? >=20 > CONFIG_HIGHPTE defaults to yes since 4.4-rc1 in arch/arm/Kconfig, so we > don't need it in sunxi_defconfig anymore. CONFIG_PM is already selected > by CONFIG_ARCH_MULTI_V7, so also no need to set that explicitly. >=20 > What's interesting is CONFIG_KEYBOARD_SUN4I_LRADC, because that actually > does _NOT_ get enabled by sunxi_defconfig. I didn't notice earlier, > because before and after my patch, the resulting .config was identical. >=20 > The problem with CONFIG_KEYBOARD_SUN4I_LRADC is that keyboard support is > explicitly disabled in sunxi_defconfig which is why > CONFIG_KEYBOARD_SUN4I_LRADC is simply ignored. > So, we need to remove the line > # CONFIG_INPUT_KEYBOARD is not set > in order to actually have CONFIG_KEYBOARD_SUN4I_LRADC enabled. >=20 > I'll write another patch for it. Great, thanks! Maxime --=20 Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com --WxezjuMNsgvRf6mf Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJWTwgdAAoJEBx+YmzsjxAgy8MP/2fJ2VOUQYaTCmRhRf+OVtqt tkR7nVUy9iOeF2h4+O6kR5NqzrYi+o7HVCPQpk5lEOmD/EVtI3VCYvinbCbt+kCI NdStiyTG0nJ+0eCUDg3CmqdnZnHCPTPvyZSJD6WF5oz7MXqO91F/cQLrRnlKTcfF hsQgMi2gmgOSWIb8YeTs54ls6myZStlmJ6oJn00fhnd3a2CjS5Iiwb1/yfM2Ivis 1we1uk6AfLK2+NZ02ZB+S6YGU9uGCTzyKlnvw8qwUJFEFignjlGuiDvVdZ/MxaGK nfYzuLQOWHT4QbFcXdlyBW0IOUCO8nYp2ChdJp4+3C7qXVfapNtvkMIV7vhE6eP/ /EAuSRUudSKKrufdGK7bU3i+5CSl8R4LhZujTQthKJKGooZ+xphJIhlSHL1N48jR pwG50xUeycnGQ4/qRJpJw2BMNH7QnjX52VQdZUkFelXpmJ1uxZSOmWNjHoLnhMgH 1A55uQnR196awZUfTw+jxq8Sxa8qdcgA5pNkg1wROCjH5Z3AoriWlnCpRlIzE6Pz uFlfAz11mE86XbO1FBmihulpM1odlzBtzPBXtBrh/kyUpin1JGgLlUzJZRDkG288 Uh49W3NHIQYcSYG38Wf8TVxbh00hYRWFvjIXAS+SmkS2Y0cJyz+SF10yindg0GaW /7PCxBZJoxtPf+oad4fb =NkEU -----END PGP SIGNATURE----- --WxezjuMNsgvRf6mf-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/