ARM: tegra: clock: Move unshared clk struct members into union

Creates a union of a struct for each type of clock to reduce memory
usage and clarify which members are used by all clocks and which are
used by a single type.
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Colin Cross <ccross@android.com>

arch/arm/mach-tegra/clock.h

@@ -47,7 +47,7 @@ struct clk_mux_sel {
 	u32		value;
 };
 
-struct clk_pll_table {
+struct clk_pll_freq_table {
 	unsigned long	input_rate;
 	unsigned long	output_rate;
 	u16		n;
@@ -74,51 +74,54 @@ enum clk_state {
 
 struct clk {
 	/* node for master clocks list */
-	struct list_head		node;
+	struct list_head	node;		/* node for list of all clocks */
 	struct list_head	children;	/* list of children */
 	struct list_head	sibling;	/* node for children */
+	struct clk_lookup	lookup;
+
 #ifdef CONFIG_DEBUG_FS
 	struct dentry		*dent;
-	struct dentry			*parent_dent;
+	bool			set;
 #endif
 	struct clk_ops		*ops;
-	struct clk			*parent;
-	struct clk_lookup		lookup;
 	unsigned long		rate;
 	unsigned long		max_rate;
 	u32			flags;
-	u32				refcnt;
 	const char		*name;
+
+	u32			refcnt;
+	enum clk_state		state;
+	struct clk		*parent;
+	u32			div;
+	u32			mul;
+
+	const struct clk_mux_sel	*inputs;
 	u32				reg;
 	u32				reg_shift;
-	unsigned int			clk_num;
-	enum clk_state			state;
-#ifdef CONFIG_DEBUG_FS
-	bool				set;
-#endif
 
-	/* PLL */
+	union {
+		struct {
+			unsigned int			clk_num;
+		} periph;
+		struct {
 			unsigned long			input_min;
 			unsigned long			input_max;
 			unsigned long			cf_min;
 			unsigned long			cf_max;
 			unsigned long			vco_min;
 			unsigned long			vco_max;
-	const struct clk_pll_table	*pll_table;
-	int				pll_lock_delay;
-
-	/* DIV */
-	u32				div;
-	u32				mul;
-
-	/* MUX */
-	const struct clk_mux_sel	*inputs;
+			const struct clk_pll_freq_table	*freq_table;
+			int				lock_delay;
+		} pll;
+		struct {
 			u32				sel;
 			u32				reg_mask;
-
-	/* Virtual cpu clock */
+		} mux;
+		struct {
 			struct clk			*main;
 			struct clk			*backup;
+		} cpu;
+	} u;
 };