Message ID | 4F790D5C.4040300@samsung.com |
---|---|
State | Superseded |
Headers | show |
On 2 April 2012 11:22, Donghwa Lee <dh09.lee@samsung.com> wrote: > This is definition of system registers for EXYNOS SoC. > > Signed-off-by: Donghwa Lee <dh09.lee@samsung.com> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> > --- > arch/arm/cpu/armv7/exynos/Makefile | 2 +- > arch/arm/cpu/armv7/exynos/system.c | 44 +++++++++++++++++++++++++ > arch/arm/include/asm/arch-exynos/cpu.h | 2 + > arch/arm/include/asm/arch-exynos/system.h | 51 +++++++++++++++++++++++++++++ > 4 files changed, 98 insertions(+), 1 deletions(-) > create mode 100644 arch/arm/cpu/armv7/exynos/system.c > create mode 100644 arch/arm/include/asm/arch-exynos/system.h > > diff --git a/arch/arm/cpu/armv7/exynos/Makefile b/arch/arm/cpu/armv7/exynos/Makefile > index 124c380..75c31dc 100644 > --- a/arch/arm/cpu/armv7/exynos/Makefile > +++ b/arch/arm/cpu/armv7/exynos/Makefile > @@ -22,7 +22,7 @@ include $(TOPDIR)/config.mk > > LIB = $(obj)lib$(SOC).o > > -COBJS += clock.o soc.o > +COBJS += clock.o soc.o system.o > > SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) > OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS)) > diff --git a/arch/arm/cpu/armv7/exynos/system.c b/arch/arm/cpu/armv7/exynos/system.c > new file mode 100644 > index 0000000..f14366c > --- /dev/null > +++ b/arch/arm/cpu/armv7/exynos/system.c > @@ -0,0 +1,44 @@ > +/* > + * Copyright (C) 2012 Samsung Electronics > + * Donghwa Lee <dh09.lee@samsung.com> > + * > + * See file CREDITS for list of people who contributed to this > + * project. > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of > + * the License, or (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, > + * MA 02111-1307 USA > + */ > + > +#include <common.h> > +#include <asm/io.h> > +#include <asm/arch/system.h> > + > +static unsigned long exynos4_set_system_display(void) > +{ > + struct exynos4_sysreg *sysreg = > + (struct exynos4_sysreg *)samsung_get_base_sysreg(); > + unsigned int cfg = 0; > + > + /* system register path set */ > + cfg = readl(&sysreg->display_ctrl); > + cfg |= (1 << 1); > + writel(cfg, &sysreg->display_ctrl); you missing return value. maybe this function can be void function. > +} > + > +unsigned long set_system_display_ctrl(void) > +{ > + if (cpu_is_exynos4()) > + return exynos4_set_system_display(); need return here. > +} > diff --git a/arch/arm/include/asm/arch-exynos/cpu.h b/arch/arm/include/asm/arch-exynos/cpu.h > index 89f2c2e..70048f0 100644 > --- a/arch/arm/include/asm/arch-exynos/cpu.h > +++ b/arch/arm/include/asm/arch-exynos/cpu.h > @@ -29,6 +29,7 @@ > /* EXYNOS4 */ > #define EXYNOS4_GPIO_PART3_BASE 0x03860000 > #define EXYNOS4_PRO_ID 0x10000000 > +#define EXYNOS4_SYSREG_BASE 0x10010000 > #define EXYNOS4_POWER_BASE 0x10020000 > #define EXYNOS4_SWRESET 0x10020400 > #define EXYNOS4_CLOCK_BASE 0x10030000 > @@ -127,6 +128,7 @@ static inline unsigned int samsung_get_base_##device(void) \ > > SAMSUNG_BASE(adc, ADC_BASE) > SAMSUNG_BASE(clock, CLOCK_BASE) > +SAMSUNG_BASE(sysreg, SYSREG_BASE) > SAMSUNG_BASE(fimd, FIMD_BASE) > SAMSUNG_BASE(gpio_part1, GPIO_PART1_BASE) > SAMSUNG_BASE(gpio_part2, GPIO_PART2_BASE) > diff --git a/arch/arm/include/asm/arch-exynos/system.h b/arch/arm/include/asm/arch-exynos/system.h > new file mode 100644 > index 0000000..2e99c0d > --- /dev/null > +++ b/arch/arm/include/asm/arch-exynos/system.h > @@ -0,0 +1,51 @@ > +/* > + * (C) Copyright 2012 Samsung Electronics > + * Donghwa Lee <dh09.lee@samsung.com> > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of > + * the License, or (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, > + * MA 02111-1307 USA > + * > + */ > + > +#ifndef __ASM_ARM_ARCH_SYSTEM_H_ > +#define __ASM_ARM_ARCH_SYSTEM_H_ > + > +#ifndef __ASSEMBLY__ > +struct exynos4_sysreg { > + unsigned char res1[0x210]; > + unsigned int display_ctrl; > + unsigned int display_ctrl2; > + unsigned int camera_control; > + unsigned int audio_endian; > + unsigned int jtag_con; > +}; > + > +struct exynos5_sysreg { > + unsigned char res1[0x214]; > + unsigned int disp1blk_cfg; > + unsigned int disp2blk_cfg; > + unsigned int hdcp_e_fuse; > + unsigned int gsclblk_cfg0; > + unsigned int gsclblk_cfg1; > + unsigned int reserved; > + unsigned int ispblk_cfg; > + unsigned int usb20phy_cfg; > + unsigned int mipi_dphy; > + unsigned int dptx_dphy; > + unsigned int phyclk_sel; > +}; > +#endif > + > +#endif /* _EXYNOS4_SYSTEM_H */ > -- Thanks. Minkyu Kang.
diff --git a/arch/arm/cpu/armv7/exynos/Makefile b/arch/arm/cpu/armv7/exynos/Makefile index 124c380..75c31dc 100644 --- a/arch/arm/cpu/armv7/exynos/Makefile +++ b/arch/arm/cpu/armv7/exynos/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).o -COBJS += clock.o soc.o +COBJS += clock.o soc.o system.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS)) diff --git a/arch/arm/cpu/armv7/exynos/system.c b/arch/arm/cpu/armv7/exynos/system.c new file mode 100644 index 0000000..f14366c --- /dev/null +++ b/arch/arm/cpu/armv7/exynos/system.c @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2012 Samsung Electronics + * Donghwa Lee <dh09.lee@samsung.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include <common.h> +#include <asm/io.h> +#include <asm/arch/system.h> + +static unsigned long exynos4_set_system_display(void) +{ + struct exynos4_sysreg *sysreg = + (struct exynos4_sysreg *)samsung_get_base_sysreg(); + unsigned int cfg = 0; + + /* system register path set */ + cfg = readl(&sysreg->display_ctrl); + cfg |= (1 << 1); + writel(cfg, &sysreg->display_ctrl); +} + +unsigned long set_system_display_ctrl(void) +{ + if (cpu_is_exynos4()) + return exynos4_set_system_display(); +} diff --git a/arch/arm/include/asm/arch-exynos/cpu.h b/arch/arm/include/asm/arch-exynos/cpu.h index 89f2c2e..70048f0 100644 --- a/arch/arm/include/asm/arch-exynos/cpu.h +++ b/arch/arm/include/asm/arch-exynos/cpu.h @@ -29,6 +29,7 @@ /* EXYNOS4 */ #define EXYNOS4_GPIO_PART3_BASE 0x03860000 #define EXYNOS4_PRO_ID 0x10000000 +#define EXYNOS4_SYSREG_BASE 0x10010000 #define EXYNOS4_POWER_BASE 0x10020000 #define EXYNOS4_SWRESET 0x10020400 #define EXYNOS4_CLOCK_BASE 0x10030000 @@ -127,6 +128,7 @@ static inline unsigned int samsung_get_base_##device(void) \ SAMSUNG_BASE(adc, ADC_BASE) SAMSUNG_BASE(clock, CLOCK_BASE) +SAMSUNG_BASE(sysreg, SYSREG_BASE) SAMSUNG_BASE(fimd, FIMD_BASE) SAMSUNG_BASE(gpio_part1, GPIO_PART1_BASE) SAMSUNG_BASE(gpio_part2, GPIO_PART2_BASE) diff --git a/arch/arm/include/asm/arch-exynos/system.h b/arch/arm/include/asm/arch-exynos/system.h new file mode 100644 index 0000000..2e99c0d --- /dev/null +++ b/arch/arm/include/asm/arch-exynos/system.h @@ -0,0 +1,51 @@ +/* + * (C) Copyright 2012 Samsung Electronics + * Donghwa Lee <dh09.lee@samsung.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + */ + +#ifndef __ASM_ARM_ARCH_SYSTEM_H_ +#define __ASM_ARM_ARCH_SYSTEM_H_ + +#ifndef __ASSEMBLY__ +struct exynos4_sysreg { + unsigned char res1[0x210]; + unsigned int display_ctrl; + unsigned int display_ctrl2; + unsigned int camera_control; + unsigned int audio_endian; + unsigned int jtag_con; +}; + +struct exynos5_sysreg { + unsigned char res1[0x214]; + unsigned int disp1blk_cfg; + unsigned int disp2blk_cfg; + unsigned int hdcp_e_fuse; + unsigned int gsclblk_cfg0; + unsigned int gsclblk_cfg1; + unsigned int reserved; + unsigned int ispblk_cfg; + unsigned int usb20phy_cfg; + unsigned int mipi_dphy; + unsigned int dptx_dphy; + unsigned int phyclk_sel; +}; +#endif + +#endif /* _EXYNOS4_SYSTEM_H */