Commit ca1aaf99 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm-fixes-6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM SoC fixes from Arnd Bergmann:
 "These are three fixes for build warnings that came in during the merge
  window"

* tag 'arm-fixes-6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: mmp: Make some symbols static
  ARM: spear6xx: Staticize few definitions
  clk: spear: Move prototype to accessible header
parents dca45efb bd60aafc

arch/arm/mach-mmp/devices.c

+4 −4
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ void pxa_usb_phy_deinit(void __iomem *phy_reg) 
static u64 __maybe_unused usb_dma_mask = ~(u32)0;



#if IS_ENABLED(CONFIG_PHY_PXA_USB)

struct resource pxa168_usb_phy_resources[] = {

static struct resource pxa168_usb_phy_resources[] = {

	[0] = {

		.start	= PXA168_U2O_PHYBASE,

		.end	= PXA168_U2O_PHYBASE + USB_PHY_RANGE,
@@ -259,7 +259,7 @@ struct platform_device pxa168_device_usb_phy = { 
#endif /* CONFIG_PHY_PXA_USB */



#if IS_ENABLED(CONFIG_USB_MV_UDC)

struct resource pxa168_u2o_resources[] = {

static struct resource pxa168_u2o_resources[] = {

	/* regbase */

	[0] = {

		.start	= PXA168_U2O_REGBASE + U2x_CAPREGS_OFFSET,
@@ -294,7 +294,7 @@ struct platform_device pxa168_device_u2o = { 
#endif /* CONFIG_USB_MV_UDC */



#if IS_ENABLED(CONFIG_USB_EHCI_MV_U2O)

struct resource pxa168_u2oehci_resources[] = {

static struct resource pxa168_u2oehci_resources[] = {

	[0] = {

		.start	= PXA168_U2O_REGBASE,

		.end	= PXA168_U2O_REGBASE + USB_REG_RANGE,
@@ -321,7 +321,7 @@ struct platform_device pxa168_device_u2oehci = { 
#endif



#if IS_ENABLED(CONFIG_USB_MV_OTG)

struct resource pxa168_u2ootg_resources[] = {

static struct resource pxa168_u2ootg_resources[] = {

	/* regbase */

	[0] = {

		.start	= PXA168_U2O_REGBASE + U2x_CAPREGS_OFFSET,

arch/arm/mach-spear/generic.h

+0 −3
Original line number Diff line number Diff line
@@ -25,11 +25,8 @@ extern struct pl022_ssp_controller pl022_plat_data; 
extern struct pl08x_platform_data pl080_plat_data;



void __init spear_setup_of_timer(void);

void __init spear3xx_clk_init(void __iomem *misc_base,

			      void __iomem *soc_config_base);

void __init spear3xx_map_io(void);

void __init spear3xx_dt_init_irq(void);

void __init spear6xx_clk_init(void __iomem *misc_base);

void __init spear13xx_map_io(void);

void __init spear13xx_l2x0_init(void);

arch/arm/mach-spear/spear3xx.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/amba/pl022.h>

#include <linux/amba/pl080.h>

#include <linux/clk.h>

#include <linux/clk/spear.h>

#include <linux/io.h>

#include <asm/mach/map.h>

#include "pl080.h"

arch/arm/mach-spear/spear6xx.c

+5 −4
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include <linux/amba/pl08x.h>

#include <linux/clk.h>

#include <linux/clk/spear.h>

#include <linux/err.h>

#include <linux/of.h>

#include <linux/of_address.h>
@@ -339,7 +340,7 @@ static struct pl08x_platform_data spear6xx_pl080_plat_data = { 
 * 0xD0000000		0xFD000000

 * 0xFC000000		0xFC000000

 */

struct map_desc spear6xx_io_desc[] __initdata = {

static struct map_desc spear6xx_io_desc[] __initdata = {

	{

		.virtual	= (unsigned long)VA_SPEAR6XX_ML_CPU_BASE,

		.pfn		= __phys_to_pfn(SPEAR_ICM3_ML1_2_BASE),
@@ -359,12 +360,12 @@ struct map_desc spear6xx_io_desc[] __initdata = { 
};



/* This will create static memory mapping for selected devices */

void __init spear6xx_map_io(void)

static void __init spear6xx_map_io(void)

{

	iotable_init(spear6xx_io_desc, ARRAY_SIZE(spear6xx_io_desc));

}



void __init spear6xx_timer_init(void)

static void __init spear6xx_timer_init(void)

{

	char pclk_name[] = "pll3_clk";

	struct clk *gpt_clk, *pclk;
@@ -394,7 +395,7 @@ void __init spear6xx_timer_init(void) 
}



/* Add auxdata to pass platform data */

struct of_dev_auxdata spear6xx_auxdata_lookup[] __initdata = {

static struct of_dev_auxdata spear6xx_auxdata_lookup[] __initdata = {

	OF_DEV_AUXDATA("arm,pl080", SPEAR_ICM3_DMA_BASE, NULL,

			&spear6xx_pl080_plat_data),

	{}

drivers/clk/spear/spear3xx_clock.c

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#include <linux/clk.h>

#include <linux/clkdev.h>

#include <linux/clk/spear.h>

#include <linux/err.h>

#include <linux/io.h>

#include <linux/of_platform.h>