[ARM] omap: i2c: use short connection ids (1d14de08) · Commits · 戴 / test

arch/arm/mach-omap1/clock.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -130,8 +130,8 @@ static struct omap_clk omap_clks[] = {
		CLK("mmci-omap.1", "ick", &armper_ck.clk, CK_16XX),
		/* Virtual clocks */
		CLK(NULL, "mpu", &virtual_ck_mpu, CK_16XX \| CK_1510 \| CK_310),
		CLK("i2c_omap.1", "i2c_fck", &i2c_fck, CK_16XX \| CK_1510 \| CK_310),
		CLK("i2c_omap.1", "i2c_ick", &i2c_ick, CK_16XX),
		CLK("i2c_omap.1", "fck", &i2c_fck, CK_16XX \| CK_1510 \| CK_310),
		CLK("i2c_omap.1", "ick", &i2c_ick, CK_16XX),
		CLK("omap-mcbsp.1", "ick", &dspper_ck, CK_16XX),
		CLK("omap-mcbsp.1", "ick", &dummy_ck, CK_1510 \| CK_310),
		CLK("omap-mcbsp.2", "ick", &armper_ck.clk, CK_16XX),

+6 −6

Original line number	Diff line number	Diff line
		@@ -186,12 +186,12 @@ static struct omap_clk omap24xx_clks[] = {
		CLK(NULL, "eac_fck", &eac_fck, CK_242X),
		CLK(NULL, "hdq_ick", &hdq_ick, CK_243X \| CK_242X),
		CLK(NULL, "hdq_fck", &hdq_fck, CK_243X \| CK_242X),
		CLK("i2c_omap.1", "i2c_ick", &i2c1_ick, CK_243X \| CK_242X),
		CLK("i2c_omap.1", "i2c_fck", &i2c1_fck, CK_242X),
		CLK("i2c_omap.1", "i2c_fck", &i2chs1_fck, CK_243X),
		CLK("i2c_omap.2", "i2c_ick", &i2c2_ick, CK_243X \| CK_242X),
		CLK("i2c_omap.2", "i2c_fck", &i2c2_fck, CK_242X),
		CLK("i2c_omap.2", "i2c_fck", &i2chs2_fck, CK_243X),
		CLK("i2c_omap.1", "ick", &i2c1_ick, CK_243X \| CK_242X),
		CLK("i2c_omap.1", "fck", &i2c1_fck, CK_242X),
		CLK("i2c_omap.1", "fck", &i2chs1_fck, CK_243X),
		CLK("i2c_omap.2", "ick", &i2c2_ick, CK_243X \| CK_242X),
		CLK("i2c_omap.2", "fck", &i2c2_fck, CK_242X),
		CLK("i2c_omap.2", "fck", &i2chs2_fck, CK_243X),
		CLK(NULL, "gpmc_fck", &gpmc_fck, CK_243X \| CK_242X),
		CLK(NULL, "sdma_fck", &sdma_fck, CK_243X \| CK_242X),
		CLK(NULL, "sdma_ick", &sdma_ick, CK_243X \| CK_242X),

+6 −6

Original line number	Diff line number	Diff line
		@@ -141,9 +141,9 @@ static struct omap_clk omap34xx_clks[] = {
		CLK("mmci-omap-hs.1", "mmchs_fck", &mmchs2_fck, CK_343X),
		CLK(NULL, "mspro_fck", &mspro_fck, CK_343X),
		CLK("mmci-omap-hs.0", "mmchs_fck", &mmchs1_fck, CK_343X),
		CLK("i2c_omap.3", "i2c_fck", &i2c3_fck, CK_343X),
		CLK("i2c_omap.2", "i2c_fck", &i2c2_fck, CK_343X),
		CLK("i2c_omap.1", "i2c_fck", &i2c1_fck, CK_343X),
		CLK("i2c_omap.3", "fck", &i2c3_fck, CK_343X),
		CLK("i2c_omap.2", "fck", &i2c2_fck, CK_343X),
		CLK("i2c_omap.1", "fck", &i2c1_fck, CK_343X),
		CLK("omap-mcbsp.5", "fck", &mcbsp5_fck, CK_343X),
		CLK("omap-mcbsp.1", "fck", &mcbsp1_fck, CK_343X),
		CLK(NULL, "core_48m_fck", &core_48m_fck, CK_343X),
		@@ -179,9 +179,9 @@ static struct omap_clk omap34xx_clks[] = {
		CLK("omap2_mcspi.3", "ick", &mcspi3_ick, CK_343X),
		CLK("omap2_mcspi.2", "ick", &mcspi2_ick, CK_343X),
		CLK("omap2_mcspi.1", "ick", &mcspi1_ick, CK_343X),
		CLK("i2c_omap.3", "i2c_ick", &i2c3_ick, CK_343X),
		CLK("i2c_omap.2", "i2c_ick", &i2c2_ick, CK_343X),
		CLK("i2c_omap.1", "i2c_ick", &i2c1_ick, CK_343X),
		CLK("i2c_omap.3", "ick", &i2c3_ick, CK_343X),
		CLK("i2c_omap.2", "ick", &i2c2_ick, CK_343X),
		CLK("i2c_omap.1", "ick", &i2c1_ick, CK_343X),
		CLK(NULL, "uart2_ick", &uart2_ick, CK_343X),
		CLK(NULL, "uart1_ick", &uart1_ick, CK_343X),
		CLK(NULL, "gpt11_ick", &gpt11_ick, CK_343X),

+2 −2

Original line number	Diff line number	Diff line
		@@ -194,14 +194,14 @@ static inline u16 omap_i2c_read_reg(struct omap_i2c_dev *i2c_dev, int reg)
		static int __init omap_i2c_get_clocks(struct omap_i2c_dev *dev)
		{
		if (cpu_is_omap16xx() \|\| cpu_class_is_omap2()) {
		dev->iclk = clk_get(dev->dev, "i2c_ick");
		dev->iclk = clk_get(dev->dev, "ick");
		if (IS_ERR(dev->iclk)) {
		dev->iclk = NULL;
		return -ENODEV;
		}
		}

		dev->fclk = clk_get(dev->dev, "i2c_fck");
		dev->fclk = clk_get(dev->dev, "fck");
		if (IS_ERR(dev->fclk)) {
		if (dev->iclk != NULL) {
		clk_put(dev->iclk);