github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 19:13:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ARM: lpc32xx: platform updates for v5.2

Browse Source 
Here are the changes for ARM NXP LPC32xx platform files:
 
 * removed TEST_CLK_SEL setup out of common clock framework control,
 * unnecessary header files are removed from inclusion,
 * registration of SSP0 and SSP1 is removed as done through device tree,
 * switched the main platform file to SPDX license identifier.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEETKMJMWSwX7CFTVIOqj3i2jwlOWUFAly7gCkACgkQqj3i2jwl
 OWWLNw//dJn8iBfuTpQZXYc3VmvcnNkAh4qgN135kk6aCPsEBujN4KVVhf3xSHLI
 6t/KX5buhd5bx+W/T8zHnKd6bwqAHP4Em9FNpFOfp9ahhOl84mLh9LrhQWFJjwGF
 dsw/XMwHvZmiu0hwyhzTi2Wdx3Iul89Sm0TmNeGfse6lrApzpyXb+297KirgVTAB
 3jQsvH/qcS4Y2D7Nw63sSIymhLeF1C4a9BQ4vrNpHrh+i1xL6VjgbDUCK/BlkdqW
 EmCPb7Vme0NUK38QVaNL65NdedOBl0KnpquURFwC3b3Kz6LVazUXjuhRoqluiW6q
 O2TTmehEGiJACRPrvS/50qWP5EPySJq010GeDtHXTC5g/kp4ykV/vfxrxRDRbkcI
 tz64n0teGNTZSKDwhUqYou/A5qiOqH4kWBOWNPO+zR2/x6xAPya2AkGxcq3Yt/nX
 r8XxY8uNEKj5+cF193UCcQ0Cx7vE5MdF5bHACl3yRuBenqPX4oVTO5SEIHYbd9h+
 RlfKaybKNDaqWgaL+GXZ3XrBoKpiSyWTfzkg+14+LOC/RS08vkYuF6TJQTMJXIZx
 qPzmYRpyDc1YfKJYDQOx9O7qd4eukdTjXtrWkvDtV5XX51RLs0mtBzj1+cVW73H6
 XDVrIa9RRxuAewJS11Cm8RMaQXM2i14XguPuHFHciP6U2uEPMNA=
 =N7UH
 -----END PGP SIGNATURE-----

Merge tag 'lpc32xx-soc-for-5.2' of https://github.com/vzapolskiy/linux-lpc32xx into arm/soc

ARM: lpc32xx: platform updates for v5.2

Here are the changes for ARM NXP LPC32xx platform files:

* removed TEST_CLK_SEL setup out of common clock framework control,
* unnecessary header files are removed from inclusion,
* registration of SSP0 and SSP1 is removed as done through device tree,
* switched the main platform file to SPDX license identifier.

* tag 'lpc32xx-soc-for-5.2' of https://github.com/vzapolskiy/linux-lpc32xx:
  ARM: lpc32xx: use SPDX license identifier
  ARM: lpc32xx: remove platform data of SSP0 and SSP1 controllers
  ARM: lpc32xx: remove redundant included headers
  ARM: lpc32xx: stop overwriting TEST_CLK_SEL

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2019-04-29 09:24:11 -07:00
commit e165908fac
1 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
arch/arm/mach-lpc32xx/phy3250.c
View File

@ -1,3 +1,4 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Platform support for LPC32xx SoC
*
@ -5,44 +6,14 @@
*
* Copyright (C) 2012 Roland Stigge <stigge@antcom.de>
* Copyright (C) 2010 NXP Semiconductors
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/device.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/dma-mapping.h>
#include <linux/gpio.h>
#include <linux/amba/bus.h>
#include <linux/amba/clcd.h>
#include <linux/amba/pl08x.h>
#include <linux/amba/mmci.h>
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h>
#include <linux/clk.h>
#include <linux/mtd/lpc32xx_slc.h>
#include <linux/mtd/lpc32xx_mlc.h>
#include <linux/mtd/lpc32xx_slc.h>
#include <linux/of_platform.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/hardware.h>
#include <mach/platform.h>
#include <mach/board.h>
#include "common.h"
static struct pl08x_channel_data pl08x_slave_channels[] = {
@ -90,8 +61,6 @@ static struct lpc32xx_mlc_platform_data lpc32xx_mlc_data = {
};
static const struct of_dev_auxdata lpc32xx_auxdata_lookup[] __initconst = {
OF_DEV_AUXDATA("arm,pl022", 0x20084000, "dev:ssp0", NULL),
OF_DEV_AUXDATA("arm,pl022", 0x2008C000, "dev:ssp1", NULL),
OF_DEV_AUXDATA("arm,pl080", 0x31000000, "pl08xdmac", &pl08x_pd),
OF_DEV_AUXDATA("nxp,lpc3220-slc", 0x20020000, "20020000.flash",
&lpc32xx_slc_data),
@ -104,11 +73,6 @@ static void __init lpc3250_machine_init(void)
{
lpc32xx_serial_init();
/* Test clock needed for UDA1380 initial init */
__raw_writel(LPC32XX_CLKPWR_TESTCLK2_SEL_MOSC |
LPC32XX_CLKPWR_TESTCLK_TESTCLK2_EN,
LPC32XX_CLKPWR_TEST_CLK_SEL);
of_platform_default_populate(NULL, lpc32xx_auxdata_lookup, NULL);
}