Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b1ee306 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.13/soc-v4-signed' of... 

Merge tag 'omap-for-v4.13/soc-v4-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

SoC changes for omap variants for v4.13 merge window:

- PM clean-up in preparation of adding am335x/am437x PM support

- Fixes for issues found by Coccinelle

- Legacy code removal now that everything boots in device
  tree only mode

- Interconnect changes in preparation of moving clkctrl clocks
  to be managed by clkctrl clock driver

- Interconnect changes to add omap4 crypto acceclerator
  support

* tag 'omap-for-v4.13/soc-v4-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

: (27 commits)
  ARM: OMAP4: hwmod_data: add SHAM crypto accelerator
  ARM: OMAP4: hwmod data: add des
  ARM: OMAP4: hwmod data: add aes2
  ARM: OMAP4: hwmod data: add aes1
  ARM: OMAP2+: Remove unused legacy code for n8x0
  ARM: OMAP2+: Remove unused legacy code for watchdog
  ARM: OMAP2+: Remove unused legacy code for interconnects
  ARM: OMAP2+: Remove unused legacy code for PRM
  ARM: OMAP2+: Remove unused legacy code for io.c
  ARM: OMAP2+: Remove unused legacy code for McBSP
  ARM: OMAP2+: SmartReflex: Delete an error message for a failed memory allocation in two functions
  ARM: OMAP2+: Use kcalloc() in sr_set_nvalues()
  ARM: OMAP2+: Improve a size determination in sr_dev_init()
  ARM: OMAP2+: Delete an error message for a failed memory allocation in two functions
  ARM: OMAP2+: Remove unused legacy code for device init
  ARM: OMAP2+: Remove unused legacy code for PMU
  ARM: OMAP2+: Remove unused legacy code for opp
  ARM: OMAP2+: hwmod: populate clkctrl clocks for hwmods if available
  ARM: OMAP4: cminst: add support for clkdm_xlate_address
  ARM: omap2+: clockdomain: add clkdm_xlate_address
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 6198c749 1df5eaa6

arch/arm/mach-omap2/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ obj-$(CONFIG_ARCH_OMAP2) += sdrc2xxx.o 


# OPP table initialization

ifeq ($(CONFIG_PM_OPP),y)

obj-y					+= opp.o

obj-$(CONFIG_ARCH_OMAP3)		+= opp3xxx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= opp4xxx_data.o

endif
@@ -220,9 +219,6 @@ obj-$(CONFIG_ARCH_OMAP4) += omap_hwmod_44xx_data.o 
obj-$(CONFIG_SOC_OMAP5)			+= omap_hwmod_54xx_data.o

obj-$(CONFIG_SOC_DRA7XX)		+= omap_hwmod_7xx_data.o



# EMU peripherals

obj-$(CONFIG_HW_PERF_EVENTS)		+= pmu.o



# OMAP2420 MSDI controller integration support ("MMC")

obj-$(CONFIG_SOC_OMAP2420)		+= msdi.o

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

+6 −8
Original line number Diff line number Diff line
@@ -53,14 +53,12 @@ static u32 board_caps; 


static void board_check_revision(void)

{

	if (of_have_populated_dt()) {

	if (of_machine_is_compatible("nokia,n800"))

		board_caps = NOKIA_N800;

	else if (of_machine_is_compatible("nokia,n810"))

		board_caps = NOKIA_N810;

	else if (of_machine_is_compatible("nokia,n810-wimax"))

		board_caps = NOKIA_N810_WIMAX;

	}



	if (!board_caps)

		pr_err("Unknown board\n");

arch/arm/mach-omap2/clockdomain.c

+8 −0
Original line number Diff line number Diff line
@@ -1224,6 +1224,14 @@ int clkdm_clk_disable(struct clockdomain *clkdm, struct clk *clk) 
	return 0;

}



u32 clkdm_xlate_address(struct clockdomain *clkdm)

{

	if (arch_clkdm->clkdm_xlate_address)

		return arch_clkdm->clkdm_xlate_address(clkdm);



	return 0;

}



/**

 * clkdm_hwmod_enable - add an enabled downstream hwmod to this clkdm

 * @clkdm: struct clockdomain *

arch/arm/mach-omap2/clockdomain.h

+2 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ struct clkdm_ops { 
	void	(*clkdm_deny_idle)(struct clockdomain *clkdm);

	int	(*clkdm_clk_enable)(struct clockdomain *clkdm);

	int	(*clkdm_clk_disable)(struct clockdomain *clkdm);

	u32	(*clkdm_xlate_address)(struct clockdomain *clkdm);

};



int clkdm_register_platform_funcs(struct clkdm_ops *co);
@@ -213,6 +214,7 @@ int clkdm_clk_enable(struct clockdomain *clkdm, struct clk *clk); 
int clkdm_clk_disable(struct clockdomain *clkdm, struct clk *clk);

int clkdm_hwmod_enable(struct clockdomain *clkdm, struct omap_hwmod *oh);

int clkdm_hwmod_disable(struct clockdomain *clkdm, struct omap_hwmod *oh);

u32 clkdm_xlate_address(struct clockdomain *clkdm);



extern void __init omap242x_clockdomains_init(void);

extern void __init omap243x_clockdomains_init(void);

arch/arm/mach-omap2/cm.h

+5 −2
Original line number Diff line number Diff line
@@ -24,8 +24,11 @@ 


# ifndef __ASSEMBLER__

#include <linux/clk/ti.h>

extern void __iomem *cm_base;

extern void __iomem *cm2_base;



#include "prcm-common.h"



extern struct omap_domain_base cm_base;

extern struct omap_domain_base cm2_base;

extern void omap2_set_globals_cm(void __iomem *cm, void __iomem *cm2);

# endif