Commit 1d66af81 authored by Danilo Krummrich's avatar Danilo Krummrich Committed by Florian Fainelli
Browse files

clk: bcm2835: remove remains from stub clk driver 



This commit removes the fixed clocks introduced as a stub clock driver
added with commit 75fabc3f ("ARM: bcm2835: add stub clock driver").
Originally they were used to drive the AMBA bus and PL011 uart driver.
Now these clocks are derived by the CPRMAN clock driver and configured
in DT.

Additionally, get rid of init_machine function in bcm2835 board file
as there's nothing to do any longer.

Signed-off-by: default avatarDanilo Krummrich <danilokrummrich@dk-develop.de>
Acked-by: default avatarEric Anholt <eric@anholt.net>
Acked-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
parent 2bd6bf03

arch/arm/mach-bcm/board_bcm2835.c

+0 −7
Original line number Diff line number Diff line
@@ -15,16 +15,10 @@ 
#include <linux/init.h>

#include <linux/irqchip.h>

#include <linux/of_address.h>

#include <linux/clk/bcm2835.h>



#include <asm/mach/arch.h>

#include <asm/mach/map.h>



static void __init bcm2835_init(void)

{

	bcm2835_init_clocks();

}



static const char * const bcm2835_compat[] = {

#ifdef CONFIG_ARCH_MULTI_V6

	"brcm,bcm2835",
@@ -36,6 +30,5 @@ static const char * const bcm2835_compat[] = { 
};



DT_MACHINE_START(BCM2835, "BCM2835")

	.init_machine = bcm2835_init,

	.dt_compat = bcm2835_compat

MACHINE_END

drivers/clk/bcm/clk-bcm2835-aux.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 


#include <linux/clk.h>

#include <linux/clk-provider.h>

#include <linux/clk/bcm2835.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <dt-bindings/clock/bcm2835-aux.h>

drivers/clk/bcm/clk-bcm2835.c

+0 −30
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include <linux/clk-provider.h>

#include <linux/clkdev.h>

#include <linux/clk.h>

#include <linux/clk/bcm2835.h>

#include <linux/debugfs.h>

#include <linux/delay.h>

#include <linux/module.h>
@@ -416,35 +415,6 @@ static int bcm2835_debugfs_regset(struct bcm2835_cprman *cprman, u32 base, 
	return regdump ? 0 : -ENOMEM;

}



/*

 * These are fixed clocks. They're probably not all root clocks and it may

 * be possible to turn them on and off but until this is mapped out better

 * it's the only way they can be used.

 */

void __init bcm2835_init_clocks(void)

{

	struct clk_hw *hw;

	int ret;



	hw = clk_hw_register_fixed_rate(NULL, "apb_pclk", NULL, 0, 126000000);

	if (IS_ERR(hw))

		pr_err("apb_pclk not registered\n");



	hw = clk_hw_register_fixed_rate(NULL, "uart0_pclk", NULL, 0, 3000000);

	if (IS_ERR(hw))

		pr_err("uart0_pclk not registered\n");

	ret = clk_hw_register_clkdev(hw, NULL, "20201000.uart");

	if (ret)

		pr_err("uart0_pclk alias not registered\n");



	hw = clk_hw_register_fixed_rate(NULL, "uart1_pclk", NULL, 0, 125000000);

	if (IS_ERR(hw))

		pr_err("uart1_pclk not registered\n");

	ret = clk_hw_register_clkdev(hw, NULL, "20215000.uart");

	if (ret)

		pr_err("uart1_pclk alias not registered\n");

}



struct bcm2835_pll_data {

	const char *name;

	u32 cm_ctrl_reg;

include/linux/clk/bcm2835.h

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 Broadcom

 *

 * 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 __LINUX_CLK_BCM2835_H_

#define __LINUX_CLK_BCM2835_H_



void __init bcm2835_init_clocks(void);



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE