Commit 107b3fb4 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

ARM: uniphier: move headers out of include/mach directory



These headers are only included locally in arch/arm/mach-uniphier/.
There is no reason to export them by putting in the mach/ directory.
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 042b28f4
......@@ -5,8 +5,9 @@
*/
#include <linux/io.h>
#include <mach/bcu-regs.h>
#include <mach/init.h>
#include "../init.h"
#include "bcu-regs.h"
#define ch(x) ((x) >= 32 ? 0 : (x) < 0 ? 0x11111111 : 0x11111111 << (x))
......
......@@ -5,8 +5,9 @@
*/
#include <linux/io.h>
#include <mach/bcu-regs.h>
#include <mach/init.h>
#include "../init.h"
#include "bcu-regs.h"
#define ch(x) ((x) >= 32 ? 0 : (x) < 0 ? 0x11111111 : 0x11111111 << (x))
......
......@@ -5,7 +5,8 @@
*/
#include <common.h>
#include <mach/micro-support-card.h>
#include "micro-support-card.h"
int board_init(void)
{
......
......@@ -4,9 +4,9 @@
* SPDX-License-Identifier: GPL-2.0+
*/
#include <mach/init.h>
#include <mach/micro-support-card.h>
#include <mach/soc_info.h>
#include "init.h"
#include "micro-support-card.h"
#include "soc-info.h"
int board_early_init_f(void)
{
......
......@@ -5,7 +5,8 @@
*/
#include <common.h>
#include <mach/micro-support-card.h>
#include "micro-support-card.h"
int board_early_init_r(void)
{
......
......@@ -7,7 +7,8 @@
#include <common.h>
#include <libfdt.h>
#include <linux/kernel.h>
#include <mach/init.h>
#include "init.h"
DECLARE_GLOBAL_DATA_PTR;
......
......@@ -7,8 +7,9 @@
#include <common.h>
#include <spl.h>
#include <linux/io.h>
#include <mach/boot-device.h>
#include <mach/sg-regs.h>
#include "../sg-regs.h"
#include "boot-device.h"
struct boot_device_info boot_device_table[] = {
{BOOT_DEVICE_NAND, "NAND (Mirror 8, ECC 8, EraseSize 128KB, Addr 4)"},
......
......@@ -7,8 +7,9 @@
#include <common.h>
#include <spl.h>
#include <linux/io.h>
#include <mach/boot-device.h>
#include <mach/sg-regs.h>
#include "../sg-regs.h"
#include "boot-device.h"
static struct boot_device_info boot_device_table[] = {
{BOOT_DEVICE_NAND, "NAND (Mirror 1, ECC 8, EraseSize 128KB, Addr 5)"},
......
......@@ -7,8 +7,9 @@
#include <common.h>
#include <spl.h>
#include <linux/io.h>
#include <mach/boot-device.h>
#include <mach/sg-regs.h>
#include "../sg-regs.h"
#include "boot-device.h"
static struct boot_device_info boot_device_table[] = {
{BOOT_DEVICE_NONE, "Reserved"},
......
......@@ -7,8 +7,9 @@
#include <common.h>
#include <spl.h>
#include <linux/io.h>
#include <mach/boot-device.h>
#include <mach/sg-regs.h>
#include "../sg-regs.h"
#include "boot-device.h"
static struct boot_device_info boot_device_table[] = {
{BOOT_DEVICE_NAND, "NAND (Mirror 8, ECC 8, EraseSize 128KB, Addr 4)"},
......
......@@ -6,9 +6,10 @@
#include <common.h>
#include <spl.h>
#include <mach/boot-device.h>
#include <mach/sbc-regs.h>
#include <mach/soc_info.h>
#include "../sbc/sbc-regs.h"
#include "../soc-info.h"
#include "boot-device.h"
u32 spl_boot_device(void)
{
......
......@@ -5,9 +5,10 @@
*/
#include <common.h>
#include <mach/boot-device.h>
#include <mach/sbc-regs.h>
#include <mach/soc_info.h>
#include "../sbc/sbc-regs.h"
#include "../soc-info.h"
#include "boot-device.h"
static int do_pinmon(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
......
......@@ -7,7 +7,8 @@
#include <common.h>
#include <linux/io.h>
#include <asm/armv7.h>
#include <mach/ssc-regs.h>
#include "ssc-regs.h"
#ifdef CONFIG_UNIPHIER_L2CACHE_ON
static void uniphier_cache_maint_all(u32 operation)
......
......@@ -5,8 +5,9 @@
*/
#include <linux/io.h>
#include <mach/init.h>
#include <mach/sc-regs.h>
#include "../init.h"
#include "../sc-regs.h"
void ph1_ld4_clk_init(void)
{
......
......@@ -5,8 +5,9 @@
*/
#include <linux/io.h>
#include <mach/init.h>
#include <mach/sc-regs.h>
#include "../init.h"
#include "../sc-regs.h"
void ph1_pro4_clk_init(void)
{
......
......@@ -5,8 +5,9 @@
*/
#include <linux/io.h>
#include <mach/init.h>
#include <mach/sc-regs.h>
#include "../init.h"
#include "../sc-regs.h"
void ph1_pro5_clk_init(void)
{
......
......@@ -5,8 +5,9 @@
*/
#include <linux/io.h>
#include <mach/init.h>
#include <mach/sc-regs.h>
#include "../init.h"
#include "../sc-regs.h"
void proxstream2_clk_init(void)
{
......
......@@ -6,7 +6,8 @@
#include <common.h>
#include <linux/io.h>
#include <mach/sg-regs.h>
#include "sg-regs.h"
int print_cpuinfo(void)
{
......
......@@ -8,9 +8,10 @@
#include <linux/serial_reg.h>
#include <linux/linkage.h>
#include <mach/bcu-regs.h>
#include <mach/sc-regs.h>
#include <mach/sg-regs.h>
#include "bcu/bcu-regs.h"
#include "sc-regs.h"
#include "sg-regs.h"
#if !defined(CONFIG_DEBUG_SEMIHOSTING)
#include CONFIG_DEBUG_LL_INCLUDE
......
......@@ -6,7 +6,8 @@
#include <common.h>
#include <linux/io.h>
#include <mach/ddrphy-regs.h>
#include "ddrphy-regs.h"
/* Select either decimal or hexadecimal */
#if 1
......
......@@ -6,7 +6,8 @@
#include <linux/types.h>
#include <linux/io.h>
#include <mach/ddrphy-regs.h>
#include "ddrphy-regs.h"
int ph1_ld4_ddrphy_init(struct ddrphy __iomem *phy, int freq, int size)
{
......
......@@ -6,7 +6,8 @@
#include <linux/types.h>
#include <linux/io.h>
#include <mach/ddrphy-regs.h>
#include "ddrphy-regs.h"
int ph1_pro4_ddrphy_init(struct ddrphy __iomem *phy, int freq, int size)
{
......
......@@ -7,7 +7,8 @@
#include <config.h>
#include <linux/types.h>
#include <linux/io.h>
#include <mach/ddrphy-regs.h>
#include "ddrphy-regs.h"
int ph1_sld8_ddrphy_init(struct ddrphy __iomem *phy, int freq, int size)
{
......
......@@ -7,7 +7,8 @@
#include <common.h>
#include <linux/err.h>
#include <linux/io.h>
#include <mach/ddrphy-regs.h>
#include "ddrphy-regs.h"
void ddrphy_prepare_training(struct ddrphy __iomem *phy, int rank)
{
......
......@@ -8,9 +8,10 @@
#include <linux/err.h>
#include <linux/io.h>
#include <linux/sizes.h>
#include <mach/init.h>
#include <mach/umc-regs.h>
#include <mach/ddrphy-regs.h>
#include "../init.h"
#include "ddrphy-regs.h"
#include "umc-regs.h"
static void umc_start_ssif(void __iomem *ssif_base)
{
......
......@@ -8,9 +8,10 @@
#include <linux/err.h>
#include <linux/io.h>
#include <linux/sizes.h>
#include <mach/init.h>
#include <mach/umc-regs.h>
#include <mach/ddrphy-regs.h>
#include "../init.h"
#include "ddrphy-regs.h"
#include "umc-regs.h"
static void umc_start_ssif(void __iomem *ssif_base)
{
......
......@@ -8,9 +8,10 @@
#include <linux/err.h>
#include <linux/io.h>
#include <linux/sizes.h>
#include <mach/init.h>
#include <mach/umc-regs.h>
#include <mach/ddrphy-regs.h>
#include "../init.h"
#include "ddrphy-regs.h"
#include "umc-regs.h"
static void umc_start_ssif(void __iomem *ssif_base)
{
......
......@@ -7,8 +7,9 @@
#include <common.h>
#include <spl.h>
#include <linux/io.h>
#include <mach/init.h>
#include <mach/sc-regs.h>
#include "../init.h"
#include "../sc-regs.h"
int ph1_ld4_early_clk_init(const struct uniphier_board_data *bd)
{
......
......@@ -5,8 +5,9 @@
*/
#include <linux/io.h>
#include <mach/init.h>
#include <mach/sc-regs.h>
#include "../init.h"
#include "../sc-regs.h"
int ph1_pro5_early_clk_init(const struct uniphier_board_data *bd)
{
......
......@@ -7,8 +7,9 @@
#include <common.h>
#include <spl.h>
#include <linux/io.h>
#include <mach/init.h>
#include <mach/sc-regs.h>
#include "../init.h"
#include "../sc-regs.h"
int proxstream2_early_clk_init(const struct uniphier_board_data *bd)
{
......
......@@ -4,8 +4,8 @@
* SPDX-License-Identifier: GPL-2.0+
*/
#include <mach/init.h>
#include <mach/sg-regs.h>
#include "../init.h"
#include "../sg-regs.h"
int ph1_sld3_early_pin_init(const struct uniphier_board_data *bd)
{
......
......@@ -6,8 +6,9 @@
#include <common.h>
#include <spl.h>
#include <mach/init.h>
#include <mach/micro-support-card.h>
#include "../init.h"
#include "../micro-support-card.h"
int ph1_ld4_init(const struct uniphier_board_data *bd)
{
......
......@@ -6,8 +6,9 @@
#include <common.h>
#include <spl.h>
#include <mach/init.h>
#include <mach/micro-support-card.h>
#include "../init.h"
#include "../micro-support-card.h"
int ph1_pro4_init(const struct uniphier_board_data *bd)
{
......
......@@ -6,8 +6,9 @@
#include <common.h>
#include <spl.h>
#include <mach/init.h>
#include <mach/micro-support-card.h>
#include "../init.h"
#include "../micro-support-card.h"
int ph1_pro5_init(const struct uniphier_board_data *bd)
{
......
......@@ -6,8 +6,9 @@
#include <common.h>
#include <spl.h>
#include <mach/init.h>
#include <mach/micro-support-card.h>
#include "../init.h"
#include "../micro-support-card.h"
int ph1_sld3_init(const struct uniphier_board_data *bd)
{
......
......@@ -6,8 +6,9 @@
#include <common.h>
#include <spl.h>
#include <mach/init.h>
#include <mach/micro-support-card.h>
#include "../init.h"
#include "../micro-support-card.h"
int ph1_sld8_init(const struct uniphier_board_data *bd)
{
......
......@@ -6,8 +6,9 @@
#include <common.h>
#include <spl.h>
#include <mach/init.h>
#include <mach/micro-support-card.h>
#include "../init.h"
#include "../micro-support-card.h"
int proxstream2_init(const struct uniphier_board_data *bd)
{
......
......@@ -6,8 +6,9 @@
#include <common.h>
#include <spl.h>
#include <mach/init.h>
#include <mach/soc_info.h>
#include "../init.h"
#include "../soc-info.h"
void spl_board_init(void)
{
......
......@@ -6,7 +6,8 @@
*/
#include <linux/linkage.h>
#include <mach/ssc-regs.h>
#include "ssc-regs.h"
ENTRY(lowlevel_init)
ldr r1, = SSCC
......
......@@ -8,7 +8,8 @@
#include <linux/linkage.h>
#include <linux/sizes.h>
#include <asm/system.h>
#include <mach/ssc-regs.h>
#include "ssc-regs.h"
ENTRY(lowlevel_init)
mov r8, lr @ persevere link reg across call
......
......@@ -8,8 +8,9 @@
#include <linux/err.h>
#include <linux/io.h>
#include <linux/sizes.h>
#include <mach/init.h>
#include <mach/sg-regs.h>
#include "../init.h"
#include "../sg-regs.h"
int ph1_sld3_memconf_init(const struct uniphier_board_data *bd)
{
......
......@@ -8,8 +8,9 @@
#include <linux/err.h>
#include <linux/io.h>
#include <linux/sizes.h>
#include <mach/init.h>
#include <mach/sg-regs.h>
#include "../init.h"
#include "../sg-regs.h"
int proxstream2_memconf_init(const struct uniphier_board_data *bd)
{
......
......@@ -8,8 +8,9 @@
#include <linux/err.h>
#include <linux/io.h>
#include <linux/sizes.h>
#include <mach/init.h>
#include <mach/sg-regs.h>
#include "../init.h"
#include "../sg-regs.h"
int memconf_init(const struct uniphier_board_data *bd)
{
......
......@@ -7,7 +7,8 @@
#include <common.h>
#include <linux/ctype.h>
#include <linux/io.h>
#include <mach/micro-support-card.h>
#include "micro-support-card.h"
#define MICRO_SUPPORT_CARD_BASE 0x43f00000
#define SMC911X_BASE ((MICRO_SUPPORT_CARD_BASE) + 0x00000)
......
......@@ -5,8 +5,9 @@
*/
#include <linux/io.h>
#include <mach/init.h>
#include <mach/sg-regs.h>
#include "../init.h"
#include "../sg-regs.h"
void ph1_ld4_pin_init(void)
{
......
......@@ -5,8 +5,9 @@
*/
#include <linux/io.h>
#include <mach/init.h>
#include <mach/sg-regs.h>
#include "../init.h"
#include "../sg-regs.h"
void ph1_ld6b_pin_init(void)
{
......
......@@ -5,8 +5,9 @@
*/
#include <linux/io.h>
#include <mach/init.h>