| Message ID | 1387272400-4689-2-git-send-email-josephl@nvidia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 12/17/2013 02:26 AM, Joseph Lo wrote: > This patch moves the tegra_btc_strapping variable to the tegra-soc.h for > the global visibility that the other Tegra device driver can access it. > It also a preparation that we can move out the Tegra20 EMC driver from > mach-tegra to the drivers folder. Rather than introduce yet more dependencies between the Tegra tree and other trees for 3.14, I'd like to see the two clock changes in this series taken into the clock tree for 3.14, and the other 2 patches deferred for 3.15. Joseph, I assume that if patches 2/4 and 4/4 are applied without patches 1/4 and 3/4, there will be no issues? This patch looks fine, I think ...
On 12/17/2013 02:26 AM, Joseph Lo wrote:
> This patch moves the tegra_btc_strapping variable to the tegra-soc.h for
s/btc/bct/
On Wed, 2013-12-18 at 06:53 +0800, Stephen Warren wrote: > On 12/17/2013 02:26 AM, Joseph Lo wrote: > > This patch moves the tegra_btc_strapping variable to the tegra-soc.h for > > the global visibility that the other Tegra device driver can access it. > > It also a preparation that we can move out the Tegra20 EMC driver from > > mach-tegra to the drivers folder. > > Rather than introduce yet more dependencies between the Tegra tree and > other trees for 3.14, I'd like to see the two clock changes in this > series taken into the clock tree for 3.14, and the other 2 patches > deferred for 3.15. > OK, sounds fine to me. So I will just update 2/4 in this series after squashing 2/4 and 4/4 into one patch. And resend the other two patches when 3.14-rc1 shows up. > Joseph, I assume that if patches 2/4 and 4/4 are applied without patches > 1/4 and 3/4, there will be no issues? Yes. It's OK. > > This patch looks fine, I think ...
diff --git a/arch/arm/mach-tegra/fuse.h b/arch/arm/mach-tegra/fuse.h index c01d04785d67..44945c8b5d17 100644 --- a/arch/arm/mach-tegra/fuse.h +++ b/arch/arm/mach-tegra/fuse.h @@ -50,8 +50,6 @@ extern int tegra_cpu_speedo_id; /* only exist in Tegra30 and later */ extern int tegra_soc_speedo_id; extern enum tegra_revision tegra_revision; -extern int tegra_bct_strapping; - unsigned long long tegra_chip_uid(void); void tegra_init_fuse(void); bool tegra_spare_fuse(int bit); diff --git a/arch/arm/mach-tegra/tegra20_speedo.c b/arch/arm/mach-tegra/tegra20_speedo.c index fa6eb570623f..3b1bb5360a92 100644 --- a/arch/arm/mach-tegra/tegra20_speedo.c +++ b/arch/arm/mach-tegra/tegra20_speedo.c @@ -16,6 +16,7 @@ #include <linux/kernel.h> #include <linux/bug.h> +#include <linux/tegra-soc.h> #include "fuse.h" diff --git a/arch/arm/mach-tegra/tegra2_emc.c b/arch/arm/mach-tegra/tegra2_emc.c index 3ae4a7f1a2fb..26e4edbd8a6a 100644 --- a/arch/arm/mach-tegra/tegra2_emc.c +++ b/arch/arm/mach-tegra/tegra2_emc.c @@ -24,9 +24,9 @@ #include <linux/of.h> #include <linux/platform_device.h> #include <linux/platform_data/tegra_emc.h> +#include <linux/tegra-soc.h> #include "tegra2_emc.h" -#include "fuse.h" #ifdef CONFIG_TEGRA_EMC_SCALING_ENABLE static bool emc_enable = true; diff --git a/include/linux/tegra-soc.h b/include/linux/tegra-soc.h index 95f611d78f3a..2e02a9a033c5 100644 --- a/include/linux/tegra-soc.h +++ b/include/linux/tegra-soc.h @@ -17,6 +17,8 @@ #ifndef __LINUX_TEGRA_SOC_H_ #define __LINUX_TEGRA_SOC_H_ +extern int tegra_bct_strapping; + u32 tegra_read_chipid(void); #endif /* __LINUX_TEGRA_SOC_H_ */
This patch moves the tegra_btc_strapping variable to the tegra-soc.h for the global visibility that the other Tegra device driver can access it. It also a preparation that we can move out the Tegra20 EMC driver from mach-tegra to the drivers folder. Signed-off-by: Joseph Lo <josephl@nvidia.com> --- arch/arm/mach-tegra/fuse.h | 2 -- arch/arm/mach-tegra/tegra20_speedo.c | 1 + arch/arm/mach-tegra/tegra2_emc.c | 2 +- include/linux/tegra-soc.h | 2 ++ 4 files changed, 4 insertions(+), 3 deletions(-)