From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Martin Date: Tue, 06 Dec 2011 15:15:41 +0000 Subject: [GIT PULL] ARM: amba: Enable module alias autogeneration for AMBA Message-Id: <20111206151541.GA13774@linaro.org> List-Id: References: <1321961573-4562-1-git-send-email-dave.martin@linaro.org> In-Reply-To: <1321961573-4562-1-git-send-email-dave.martin@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Russell King - ARM Linux Cc: patches@linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Alan Cox , Alessandro Rubini , Alessandro Zummo , alsa-devel@alsa-project.org, Chris Ball , Dan Williams , Dmitry Torokhov , Grant Likely , Jaroslav Kysela , Jassi Brar , Julia Lawall , Linus Walleij , linux-fbdev@vger.kernel.org, linux-input@vger.kernel.org, linux-mmc@vger.kernel.org, linux-serial@vger.kernel.org, linux-watchdog@vger.kernel.org, Paul Mundt , =?utf-8?B?UGF3ZcWC?= Moll , rtc-linux@googlegroups.com, spi-devel-general@lists.sourceforge.net, Takashi Iwai , Vinod Koul Hi Russell, Further to my previous pull request: > The following changes since commit cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37: > > Linux 3.2-rc2 (2011-11-15 15:02:59 -0200) > > are available in the git repository at: > git://git.linaro.org/people/dmart/linux-2.6-arm.git arm/amba-modalias+for-rmk > > Dave Martin (16): > ARM: amba: Move definition of struct amba_id to mod_devicetable.h > ARM: amba: Auto-generate AMBA driver module aliases during modpost [...] ... it looks like Alessandro's proposed change to tidy up scripts/mod/ ile2alias.c may get merged soon -- if that happens, you will get a conflict with the second patch of the series referenced by the previous pull request. Fixing it up is straightforward -- if you prefer to resolve the conflict yourself, that's fine by me. Alternatively, you can pull the following modified series instead. The only difference is in the second patch ("ARM: amba: Auto-generate AMBA driver module aliases during modpost"). Cheers ---Dave The following changes since commit 114339d31aa813995461866c659bbf07e1cf2267: modpost: use table-lookup to build module aliases (2011-12-02 15:18:08 +0000) are available in the git repository at: git://git.linaro.org/people/dmart/linux-2.6-arm.git arm/amba-modalias+alessandro-modalias-v2+for-rmk Dave Martin (16): ARM: amba: Move definition of struct amba_id to mod_devicetable.h ARM: amba: Auto-generate AMBA driver module aliases during modpost hwrng: nomadik: Enable module alias autogeneration for AMBA drivers dmaengine: pl08x: Enable module alias autogeneration for AMBA drivers dmaengine: pl330: Enable module alias autogeneration for AMBA drivers gpio: pl061: Enable module alias autogeneration for AMBA drivers input: ambakmi: Enable module alias autogeneration for AMBA drivers mmc: mmci: Enable module alias autogeneration for AMBA drivers rtc: pl030: Enable module alias autogeneration for AMBA drivers rtc: pl031: Enable module alias autogeneration for AMBA drivers spi: pl022: Enable module alias autogeneration for AMBA drivers serial: pl010: Enable module alias autogeneration for AMBA drivers serial: pl011: Enable module alias autogeneration for AMBA drivers fbdev: amba: Enable module alias autogeneration for AMBA drivers watchdog: sp805: Enable module alias autogeneration for AMBA drivers sound: aaci: Enable module alias autogeneration for AMBA drivers drivers/amba/bus.c | 4 ++ drivers/char/hw_random/nomadik-rng.c | 2 + drivers/dma/amba-pl08x.c | 2 + drivers/dma/pl330.c | 2 + drivers/gpio/gpio-pl061.c | 2 + drivers/input/serio/ambakmi.c | 2 + drivers/mmc/host/mmci.c | 2 + drivers/rtc/rtc-pl030.c | 2 + drivers/rtc/rtc-pl031.c | 2 + drivers/spi/spi-pl022.c | 2 + drivers/tty/serial/amba-pl010.c | 2 + drivers/tty/serial/amba-pl011.c | 2 + drivers/video/amba-clcd.c | 2 + drivers/watchdog/sp805_wdt.c | 2 + include/linux/amba/bus.h | 7 +--- include/linux/mod_devicetable.h | 18 +++++++++ scripts/mod/file2alias.c | 71 +++++++++++++++++++++++++++++++++- sound/arm/aaci.c | 2 + 18 files changed, 121 insertions(+), 7 deletions(-)