Commit 721c46bf authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'omap/omap2-cleanup' of... 

Merge branch 'omap/omap2-cleanup' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc into arm/soc

While going through the removal of board files on some other
platforms, I noticed a bit of outdated code on omap2+ that
was left behind after the platform became DT only.

This is a separate branch, to avoid conflicts with other omap2
changes.

* 'omap/omap2-cleanup' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: omap2: make functions static
  ARM: omap2: remove unused omap2_pm_init
  ARM: omap2: remove unused declarations
  ARM: omap2: remove unused functions
  ARM: omap2: smartreflex: remove on_init control
  ARM: omap2: remove APLL control
  ARM: omap2: simplify clock2xxx header
  ARM: omap2: remove unused omap_hwmod_reset.c
  ARM: omap2: remove unused headers
  ARM: omap2: remove unused USB code
  ARM: remove CONFIG_UNUSED_BOARD_FILES
parents 88603b6d 6aeb51c1

arch/arm/Kconfig

+0 −13
Original line number Diff line number Diff line
@@ -1465,19 +1465,6 @@ config ATAGS 
	  the ARM_ATAG_DTB_COMPAT option) then you may unselect this option

	  to remove ATAGS support from your kernel binary.



config UNUSED_BOARD_FILES

	bool "Board support for machines without known users"

	depends on ATAGS

	help

	  Most ATAGS based board files are completely unused and are

	  scheduled for removal in early 2023, and left out of kernels

	  by default now.  If you are using a board file that is marked

	  as unused, turn on this option to build support into the kernel.



	  To keep support for your individual board from being removed,

	  send a reply to the email discussion at

	  https://lore.kernel.org/all/CAK8P3a0Z9vGEQbVRBo84bSyPFM-LF+hs5w8ZA51g2Z+NsdtDQA@mail.gmail.com/



config DEPRECATED_PARAM_STRUCT

	bool "Provide old way to pass kernel parameters"

	depends on ATAGS

arch/arm/mach-omap2/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
obj-y := id.o io.o control.o devices.o fb.o pm.o \

	 common.o dma.o omap-headsmp.o sram.o



hwmod-common				= omap_hwmod.o omap_hwmod_reset.o \

hwmod-common				= omap_hwmod.o \

					  omap_hwmod_common_data.o \

					  omap_hwmod_common_ipblock_data.o \

					  omap_device.o display.o hdq1w.o \
@@ -80,7 +80,6 @@ obj-$(CONFIG_ARCH_OMAP4) += $(omap-4-5-pm-common) 
obj-$(CONFIG_SOC_OMAP5)			+= $(omap-4-5-pm-common)



ifeq ($(CONFIG_PM),y)

obj-$(CONFIG_ARCH_OMAP2)		+= pm24xx.o

obj-$(CONFIG_ARCH_OMAP2)		+= sleep24xx.o

obj-$(CONFIG_ARCH_OMAP3)		+= pm34xx.o sleep34xx.o

omap-4-5-pm-common			+= pm44xx.o

arch/arm/mach-omap2/board-n8x0.c

+1 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ static void __init n8x0_mmc_init(void) 
}

#else

static struct omap_mmc_platform_data mmc1_data;

void __init n8x0_mmc_init(void)

static void __init n8x0_mmc_init(void)

{

}

#endif	/* CONFIG_MMC_OMAP */

arch/arm/mach-omap2/clkt2xxx_dpllcore.c

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

#include <linux/errno.h>

#include <linux/clk.h>

#include <linux/clk/ti.h>

#include <linux/io.h>



#include "clock.h"

arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c

+8 −6
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 
#include "sdrc.h"

#include "sram.h"



static u16 cpu_mask;



const struct prcm_config *curr_prcm_set;

const struct prcm_config *rate_table;
@@ -55,7 +57,7 @@ static unsigned long sys_ck_rate; 
 *

 * Set virt_prcm_set's rate to the mpu_speed field of the current PRCM set.

 */

unsigned long omap2_table_mpu_recalc(struct clk_hw *clk,

static unsigned long omap2_table_mpu_recalc(struct clk_hw *clk,

				     unsigned long parent_rate)

{

	return curr_prcm_set->mpu_speed;
@@ -68,7 +70,7 @@ unsigned long omap2_table_mpu_recalc(struct clk_hw *clk, 
 * Some might argue L3-DDR, others ARM, others IVA. This code is simple and

 * just uses the ARM rates.

 */

long omap2_round_to_table_rate(struct clk_hw *hw, unsigned long rate,

static long omap2_round_to_table_rate(struct clk_hw *hw, unsigned long rate,

			       unsigned long *parent_rate)

{

	const struct prcm_config *ptr;
@@ -92,7 +94,7 @@ long omap2_round_to_table_rate(struct clk_hw *hw, unsigned long rate, 
}



/* Sets basic clocks based on the specified rate */

int omap2_select_table_rate(struct clk_hw *hw, unsigned long rate,

static int omap2_select_table_rate(struct clk_hw *hw, unsigned long rate,

				   unsigned long parent_rate)

{

	u32 cur_rate, done_rate, bypass = 0;
@@ -167,7 +169,7 @@ int omap2_select_table_rate(struct clk_hw *hw, unsigned long rate, 
 * global to point to the active rate set when found; otherwise, sets

 * it to NULL.  No return value;

 */

void omap2xxx_clkt_vps_check_bootloader_rates(void)

static void omap2xxx_clkt_vps_check_bootloader_rates(void)

{

	const struct prcm_config *prcm = NULL;

	unsigned long rate;
@@ -193,7 +195,7 @@ void omap2xxx_clkt_vps_check_bootloader_rates(void) 
 * sys_ck rate, but before the virt_prcm_set clock rate is

 * recalculated.  No return value.

 */

void omap2xxx_clkt_vps_late_init(void)

static void omap2xxx_clkt_vps_late_init(void)

{

	struct clk *c;