Commit 4d38bd12 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Add dm816x hwmod support 

Add minimal hwmod support that works at least on dm8168. This
is based on the code in the earlier TI CDP tree, and an earlier
patch by Aida Mynzhasova <aida.mynzhasova@skitlab.ru>.

I've set up things to work pretty much the same way as for
am33xx. We are basically using cm33xx.c with a different set
of clocks and clockdomains.

This code is based on the TI81XX-LINUX-PSP-04.04.00.02 patches
published at:

http://downloads.ti.com/dsps/dsps_public_sw/psp/LinuxPSP/TI81XX_04_04/04_04_00_02/index_FDS.html



Cc: Aida Mynzhasova <aida.mynzhasova@skitlab.ru>
Cc: Brian Hutchinson <b.hutchman@gmail.com>
Acked-by: default avatarPaul Walmsley <paul@pwsan.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent a64459c4

arch/arm/mach-omap2/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -121,6 +121,7 @@ obj-$(CONFIG_ARCH_OMAP4) += $(omap-prcm-4-5-common) 
obj-$(CONFIG_SOC_OMAP5)			+= $(omap-prcm-4-5-common)

obj-$(CONFIG_SOC_OMAP5)			+= $(omap-prcm-4-5-common)

obj-$(CONFIG_SOC_DRA7XX)		+= $(omap-prcm-4-5-common)

obj-$(CONFIG_SOC_DRA7XX)		+= $(omap-prcm-4-5-common)

am33xx-43xx-prcm-common			+= prm33xx.o cm33xx.o

am33xx-43xx-prcm-common			+= prm33xx.o cm33xx.o

obj-$(CONFIG_SOC_TI81XX)		+= $(am33xx-43xx-prcm-common)

obj-$(CONFIG_SOC_AM33XX)		+= $(am33xx-43xx-prcm-common)

obj-$(CONFIG_SOC_AM33XX)		+= $(am33xx-43xx-prcm-common)

obj-$(CONFIG_SOC_AM43XX)		+= $(omap-prcm-4-5-common) \

obj-$(CONFIG_SOC_AM43XX)		+= $(omap-prcm-4-5-common) \

					   $(am33xx-43xx-prcm-common)

					   $(am33xx-43xx-prcm-common)
@@ -226,6 +227,7 @@ obj-$(CONFIG_SOC_AM33XX) += omap_hwmod_33xx_43xx_ipblock_data.o 
obj-$(CONFIG_SOC_AM43XX)		+= omap_hwmod_43xx_data.o

obj-$(CONFIG_SOC_AM43XX)		+= omap_hwmod_43xx_data.o

obj-$(CONFIG_SOC_AM43XX)		+= omap_hwmod_33xx_43xx_interconnect_data.o

obj-$(CONFIG_SOC_AM43XX)		+= omap_hwmod_33xx_43xx_interconnect_data.o

obj-$(CONFIG_SOC_AM43XX)		+= omap_hwmod_33xx_43xx_ipblock_data.o

obj-$(CONFIG_SOC_AM43XX)		+= omap_hwmod_33xx_43xx_ipblock_data.o

obj-$(CONFIG_SOC_TI81XX)		+= omap_hwmod_81xx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= omap_hwmod_44xx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= omap_hwmod_44xx_data.o

obj-$(CONFIG_SOC_OMAP5)			+= omap_hwmod_54xx_data.o

obj-$(CONFIG_SOC_OMAP5)			+= omap_hwmod_54xx_data.o

obj-$(CONFIG_SOC_DRA7XX)		+= omap_hwmod_7xx_data.o

obj-$(CONFIG_SOC_DRA7XX)		+= omap_hwmod_7xx_data.o

arch/arm/mach-omap2/io.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -545,10 +545,12 @@ void __init ti814x_init_early(void) 
	omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(TI81XX_PRCM_BASE), NULL);

	omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(TI81XX_PRCM_BASE), NULL);

	omap3xxx_check_revision();

	omap3xxx_check_revision();

	ti81xx_check_features();

	ti81xx_check_features();

	am33xx_prm_init();

	am33xx_cm_init();

	omap3xxx_voltagedomains_init();

	omap3xxx_voltagedomains_init();

	omap3xxx_powerdomains_init();

	omap3xxx_powerdomains_init();

	ti81xx_clockdomains_init();

	ti81xx_clockdomains_init();

	omap3xxx_hwmod_init();

	ti81xx_hwmod_init();

	omap_hwmod_init_postsetup();

	omap_hwmod_init_postsetup();

	if (of_have_populated_dt())

	if (of_have_populated_dt())

		omap_clk_soc_init = ti81xx_dt_clk_init;

		omap_clk_soc_init = ti81xx_dt_clk_init;
@@ -564,10 +566,12 @@ void __init ti816x_init_early(void) 
	omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(TI81XX_PRCM_BASE), NULL);

	omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(TI81XX_PRCM_BASE), NULL);

	omap3xxx_check_revision();

	omap3xxx_check_revision();

	ti81xx_check_features();

	ti81xx_check_features();

	am33xx_prm_init();

	am33xx_cm_init();

	omap3xxx_voltagedomains_init();

	omap3xxx_voltagedomains_init();

	omap3xxx_powerdomains_init();

	omap3xxx_powerdomains_init();

	ti81xx_clockdomains_init();

	ti81xx_clockdomains_init();

	omap3xxx_hwmod_init();

	ti81xx_hwmod_init();

	omap_hwmod_init_postsetup();

	omap_hwmod_init_postsetup();

	if (of_have_populated_dt())

	if (of_have_populated_dt())

		omap_clk_soc_init = ti81xx_dt_clk_init;

		omap_clk_soc_init = ti81xx_dt_clk_init;

arch/arm/mach-omap2/omap_hwmod.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -4142,7 +4142,7 @@ void __init omap_hwmod_init(void) 
		soc_ops.deassert_hardreset = _omap4_deassert_hardreset;

		soc_ops.deassert_hardreset = _omap4_deassert_hardreset;

		soc_ops.is_hardreset_asserted = _omap4_is_hardreset_asserted;

		soc_ops.is_hardreset_asserted = _omap4_is_hardreset_asserted;

		soc_ops.init_clkdm = _init_clkdm;

		soc_ops.init_clkdm = _init_clkdm;

	} else if (soc_is_am33xx()) {

	} else if (cpu_is_ti816x() || soc_is_am33xx()) {

		soc_ops.enable_module = _omap4_enable_module;

		soc_ops.enable_module = _omap4_enable_module;

		soc_ops.disable_module = _omap4_disable_module;

		soc_ops.disable_module = _omap4_disable_module;

		soc_ops.wait_target_ready = _omap4_wait_target_ready;

		soc_ops.wait_target_ready = _omap4_wait_target_ready;

arch/arm/mach-omap2/omap_hwmod.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -763,6 +763,7 @@ extern int omap3xxx_hwmod_init(void); 
extern int omap44xx_hwmod_init(void);

extern int omap44xx_hwmod_init(void);

extern int omap54xx_hwmod_init(void);

extern int omap54xx_hwmod_init(void);

extern int am33xx_hwmod_init(void);

extern int am33xx_hwmod_init(void);

extern int ti81xx_hwmod_init(void);

extern int dra7xx_hwmod_init(void);

extern int dra7xx_hwmod_init(void);

int am43xx_hwmod_init(void);

int am43xx_hwmod_init(void);

arch/arm/mach-omap2/omap_hwmod_81xx_data.c

0 → 100644
+1136 −0

File added.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE