Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+3 -39
+3 -39
arch/arm/mach-lpc32xx/phy3250.c
··· 1 + // SPDX-License-Identifier: GPL-2.0+ 1 2 /* 2 3 * Platform support for LPC32xx SoC 3 4 * ··· 6 5 * 7 6 * Copyright (C) 2012 Roland Stigge <stigge@antcom.de> 8 7 * Copyright (C) 2010 NXP Semiconductors 9 - * 10 - * This program is free software; you can redistribute it and/or modify 11 - * it under the terms of the GNU General Public License as published by 12 - * the Free Software Foundation; either version 2 of the License, or 13 - * (at your option) any later version. 14 - * 15 - * This program is distributed in the hope that it will be useful, 16 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 17 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 18 - * GNU General Public License for more details. 19 8 */ 20 9 21 - #include <linux/init.h> 22 - #include <linux/platform_device.h> 23 - #include <linux/device.h> 24 - #include <linux/interrupt.h> 25 - #include <linux/irq.h> 26 - #include <linux/dma-mapping.h> 27 - #include <linux/gpio.h> 28 - #include <linux/amba/bus.h> 29 - #include <linux/amba/clcd.h> 30 10 #include <linux/amba/pl08x.h> 31 - #include <linux/amba/mmci.h> 32 - #include <linux/of.h> 33 - #include <linux/of_address.h> 34 - #include <linux/of_irq.h> 35 - #include <linux/of_platform.h> 36 - #include <linux/clk.h> 37 - #include <linux/mtd/lpc32xx_slc.h> 38 11 #include <linux/mtd/lpc32xx_mlc.h> 12 + #include <linux/mtd/lpc32xx_slc.h> 13 + #include <linux/of_platform.h> 39 14 40 - #include <asm/setup.h> 41 - #include <asm/mach-types.h> 42 15 #include <asm/mach/arch.h> 43 - 44 - #include <mach/hardware.h> 45 - #include <mach/platform.h> 46 - #include <mach/board.h> 47 16 #include "common.h" 48 17 49 18 static struct pl08x_channel_data pl08x_slave_channels[] = { ··· 61 90 }; 62 91 63 92 static const struct of_dev_auxdata lpc32xx_auxdata_lookup[] __initconst = { 64 - OF_DEV_AUXDATA("arm,pl022", 0x20084000, "dev:ssp0", NULL), 65 - OF_DEV_AUXDATA("arm,pl022", 0x2008C000, "dev:ssp1", NULL), 66 93 OF_DEV_AUXDATA("arm,pl080", 0x31000000, "pl08xdmac", &pl08x_pd), 67 94 OF_DEV_AUXDATA("nxp,lpc3220-slc", 0x20020000, "20020000.flash", 68 95 &lpc32xx_slc_data), ··· 72 103 static void __init lpc3250_machine_init(void) 73 104 { 74 105 lpc32xx_serial_init(); 75 - 76 - /* Test clock needed for UDA1380 initial init */ 77 - __raw_writel(LPC32XX_CLKPWR_TESTCLK2_SEL_MOSC | 78 - LPC32XX_CLKPWR_TESTCLK_TESTCLK2_EN, 79 - LPC32XX_CLKPWR_TEST_CLK_SEL); 80 106 81 107 of_platform_default_populate(NULL, lpc32xx_auxdata_lookup, NULL); 82 108 }