Commit 27946315 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'armsoc-for-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Olof Johansson:
 "A collection of fixes this week:

   - A set of clock fixes for shmobile platforms
   - A fix for tegra that moves serial port labels to be per board.
     We're choosing to merge this for 3.18 because the labels will start
     being parsed in 3.19, and without this change serial port numbers
     that used to be stable since the dawn of time will change numbers.
   - A few other DT tweaks for Tegra.
   - A fix for multi_v7_defconfig that makes it stop spewing cpufreq
     errors on Arndale (Exynos)"

* tag 'armsoc-for-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: multi_v7_defconfig: fix failure setting CPU voltage by enabling dependent I2C controller
  ARM: tegra: roth: Fix SD card VDD_IO regulator
  ARM: tegra: Remove eMMC vmmc property for roth/tn7
  ARM: dts: tegra: move serial aliases to per-board
  ARM: tegra: Add serial port labels to Tegra124 DT
  ARM: shmobile: kzm9g legacy: Set i2c clks_per_count to 2
  ARM: shmobile: r8a7740 dtsi: Correct IIC0 parent clock
  ARM: shmobile: r8a7790: Fix SD3CKCR address to device tree
  ARM: shmobile: r8a7740 legacy: Correct IIC0 parent clock
  ARM: shmobile: r8a7740 legacy: Add missing INTCA clock for irqpin module
  ARM: shmobile: r8a7790: Fix SD3CKCR address
  ARM: dts: sun6i: Re-parent ahb1_mux to pll6 as required by dma controller
parents 9f2e0f63 49e41938
...@@ -433,7 +433,7 @@ mstp1_clks: mstp1_clks@e6150134 { ...@@ -433,7 +433,7 @@ mstp1_clks: mstp1_clks@e6150134 {
clocks = <&cpg_clocks R8A7740_CLK_S>, clocks = <&cpg_clocks R8A7740_CLK_S>,
<&cpg_clocks R8A7740_CLK_S>, <&sub_clk>, <&cpg_clocks R8A7740_CLK_S>, <&sub_clk>,
<&cpg_clocks R8A7740_CLK_B>, <&cpg_clocks R8A7740_CLK_B>,
<&sub_clk>, <&sub_clk>, <&cpg_clocks R8A7740_CLK_HPP>, <&sub_clk>,
<&cpg_clocks R8A7740_CLK_B>; <&cpg_clocks R8A7740_CLK_B>;
#clock-cells = <1>; #clock-cells = <1>;
renesas,clock-indices = < renesas,clock-indices = <
......
...@@ -666,9 +666,9 @@ sd2_clk: sd2_clk@e6150078 { ...@@ -666,9 +666,9 @@ sd2_clk: sd2_clk@e6150078 {
#clock-cells = <0>; #clock-cells = <0>;
clock-output-names = "sd2"; clock-output-names = "sd2";
}; };
sd3_clk: sd3_clk@e615007c { sd3_clk: sd3_clk@e615026c {
compatible = "renesas,r8a7790-div6-clock", "renesas,cpg-div6-clock"; compatible = "renesas,r8a7790-div6-clock", "renesas,cpg-div6-clock";
reg = <0 0xe615007c 0 4>; reg = <0 0xe615026c 0 4>;
clocks = <&pll1_div2_clk>; clocks = <&pll1_div2_clk>;
#clock-cells = <0>; #clock-cells = <0>;
clock-output-names = "sd3"; clock-output-names = "sd3";
......
...@@ -361,6 +361,10 @@ dma: dma-controller@01c02000 { ...@@ -361,6 +361,10 @@ dma: dma-controller@01c02000 {
clocks = <&ahb1_gates 6>; clocks = <&ahb1_gates 6>;
resets = <&ahb1_rst 6>; resets = <&ahb1_rst 6>;
#dma-cells = <1>; #dma-cells = <1>;
/* DMA controller requires AHB1 clocked from PLL6 */
assigned-clocks = <&ahb1_mux>;
assigned-clock-parents = <&pll6>;
}; };
mmc0: mmc@01c0f000 { mmc0: mmc@01c0f000 {
......
...@@ -15,6 +15,7 @@ / { ...@@ -15,6 +15,7 @@ / {
aliases { aliases {
rtc0 = "/i2c@7000d000/tps65913@58"; rtc0 = "/i2c@7000d000/tps65913@58";
rtc1 = "/rtc@7000e000"; rtc1 = "/rtc@7000e000";
serial0 = &uartd;
}; };
memory { memory {
......
...@@ -15,6 +15,10 @@ chosen { ...@@ -15,6 +15,10 @@ chosen {
linux,initrd-end = <0x82800000>; linux,initrd-end = <0x82800000>;
}; };
aliases {
serial0 = &uartd;
};
firmware { firmware {
trusted-foundations { trusted-foundations {
compatible = "tlm,trusted-foundations"; compatible = "tlm,trusted-foundations";
...@@ -916,8 +920,6 @@ vddio_sdmmc3: ldo9 { ...@@ -916,8 +920,6 @@ vddio_sdmmc3: ldo9 {
regulator-name = "vddio-sdmmc3"; regulator-name = "vddio-sdmmc3";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-always-on;
regulator-boot-on;
}; };
ldousb { ldousb {
...@@ -962,7 +964,7 @@ pmc@7000e400 { ...@@ -962,7 +964,7 @@ pmc@7000e400 {
sdhci@78000400 { sdhci@78000400 {
status = "okay"; status = "okay";
bus-width = <4>; bus-width = <4>;
vmmc-supply = <&vddio_sdmmc3>; vqmmc-supply = <&vddio_sdmmc3>;
cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>; cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
power-gpios = <&gpio TEGRA_GPIO(H, 0) GPIO_ACTIVE_HIGH>; power-gpios = <&gpio TEGRA_GPIO(H, 0) GPIO_ACTIVE_HIGH>;
}; };
...@@ -971,7 +973,6 @@ sdhci@78000400 { ...@@ -971,7 +973,6 @@ sdhci@78000400 {
sdhci@78000600 { sdhci@78000600 {
status = "okay"; status = "okay";
bus-width = <8>; bus-width = <8>;
vmmc-supply = <&vdd_1v8>;
non-removable; non-removable;
}; };
......
...@@ -15,6 +15,10 @@ chosen { ...@@ -15,6 +15,10 @@ chosen {
linux,initrd-end = <0x82800000>; linux,initrd-end = <0x82800000>;
}; };
aliases {
serial0 = &uartd;
};
firmware { firmware {
trusted-foundations { trusted-foundations {
compatible = "tlm,trusted-foundations"; compatible = "tlm,trusted-foundations";
...@@ -240,7 +244,6 @@ pmc@7000e400 { ...@@ -240,7 +244,6 @@ pmc@7000e400 {
sdhci@78000600 { sdhci@78000600 {
status = "okay"; status = "okay";
bus-width = <8>; bus-width = <8>;
vmmc-supply = <&vdd_1v8>;
non-removable; non-removable;
}; };
......
...@@ -9,13 +9,6 @@ / { ...@@ -9,13 +9,6 @@ / {
compatible = "nvidia,tegra114"; compatible = "nvidia,tegra114";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
aliases {
serial0 = &uarta;
serial1 = &uartb;
serial2 = &uartc;
serial3 = &uartd;
};
host1x@50000000 { host1x@50000000 {
compatible = "nvidia,tegra114-host1x", "simple-bus"; compatible = "nvidia,tegra114-host1x", "simple-bus";
reg = <0x50000000 0x00028000>; reg = <0x50000000 0x00028000>;
......
...@@ -10,6 +10,7 @@ / { ...@@ -10,6 +10,7 @@ / {
aliases { aliases {
rtc0 = "/i2c@0,7000d000/pmic@40"; rtc0 = "/i2c@0,7000d000/pmic@40";
rtc1 = "/rtc@0,7000e000"; rtc1 = "/rtc@0,7000e000";
serial0 = &uartd;
}; };
memory { memory {
......
...@@ -10,6 +10,7 @@ / { ...@@ -10,6 +10,7 @@ / {
aliases { aliases {
rtc0 = "/i2c@0,7000d000/pmic@40"; rtc0 = "/i2c@0,7000d000/pmic@40";
rtc1 = "/rtc@0,7000e000"; rtc1 = "/rtc@0,7000e000";
serial0 = &uarta;
}; };
memory { memory {
......
...@@ -10,6 +10,7 @@ / { ...@@ -10,6 +10,7 @@ / {
aliases { aliases {
rtc0 = "/i2c@0,7000d000/pmic@40"; rtc0 = "/i2c@0,7000d000/pmic@40";
rtc1 = "/rtc@0,7000e000"; rtc1 = "/rtc@0,7000e000";
serial0 = &uarta;
}; };
memory { memory {
......
...@@ -286,7 +286,7 @@ pinmux: pinmux@0,70000868 { ...@@ -286,7 +286,7 @@ pinmux: pinmux@0,70000868 {
* the APB DMA based serial driver, the comptible is * the APB DMA based serial driver, the comptible is
* "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart". * "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart".
*/ */
serial@0,70006000 { uarta: serial@0,70006000 {
compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart"; compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart";
reg = <0x0 0x70006000 0x0 0x40>; reg = <0x0 0x70006000 0x0 0x40>;
reg-shift = <2>; reg-shift = <2>;
...@@ -299,7 +299,7 @@ serial@0,70006000 { ...@@ -299,7 +299,7 @@ serial@0,70006000 {
status = "disabled"; status = "disabled";
}; };
serial@0,70006040 { uartb: serial@0,70006040 {
compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart"; compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart";
reg = <0x0 0x70006040 0x0 0x40>; reg = <0x0 0x70006040 0x0 0x40>;
reg-shift = <2>; reg-shift = <2>;
...@@ -312,7 +312,7 @@ serial@0,70006040 { ...@@ -312,7 +312,7 @@ serial@0,70006040 {
status = "disabled"; status = "disabled";
}; };
serial@0,70006200 { uartc: serial@0,70006200 {
compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart"; compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart";
reg = <0x0 0x70006200 0x0 0x40>; reg = <0x0 0x70006200 0x0 0x40>;
reg-shift = <2>; reg-shift = <2>;
...@@ -325,7 +325,7 @@ serial@0,70006200 { ...@@ -325,7 +325,7 @@ serial@0,70006200 {
status = "disabled"; status = "disabled";
}; };
serial@0,70006300 { uartd: serial@0,70006300 {
compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart"; compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart";
reg = <0x0 0x70006300 0x0 0x40>; reg = <0x0 0x70006300 0x0 0x40>;
reg-shift = <2>; reg-shift = <2>;
......
...@@ -10,6 +10,7 @@ / { ...@@ -10,6 +10,7 @@ / {
aliases { aliases {
rtc0 = "/i2c@7000d000/tps6586x@34"; rtc0 = "/i2c@7000d000/tps6586x@34";
rtc1 = "/rtc@7000e000"; rtc1 = "/rtc@7000e000";
serial0 = &uartd;
}; };
memory { memory {
......
...@@ -6,6 +6,11 @@ / { ...@@ -6,6 +6,11 @@ / {
model = "Toradex Colibri T20 512MB on Iris"; model = "Toradex Colibri T20 512MB on Iris";
compatible = "toradex,iris", "toradex,colibri_t20-512", "nvidia,tegra20"; compatible = "toradex,iris", "toradex,colibri_t20-512", "nvidia,tegra20";
aliases {
serial0 = &uarta;
serial1 = &uartd;
};
host1x@50000000 { host1x@50000000 {
hdmi@54280000 { hdmi@54280000 {
status = "okay"; status = "okay";
......
...@@ -6,6 +6,10 @@ / { ...@@ -6,6 +6,10 @@ / {
model = "Avionic Design Medcom-Wide board"; model = "Avionic Design Medcom-Wide board";
compatible = "ad,medcom-wide", "ad,tamonten", "nvidia,tegra20"; compatible = "ad,medcom-wide", "ad,tamonten", "nvidia,tegra20";
aliases {
serial0 = &uartd;
};
pwm@7000a000 { pwm@7000a000 {
status = "okay"; status = "okay";
}; };
......
...@@ -10,6 +10,8 @@ / { ...@@ -10,6 +10,8 @@ / {
aliases { aliases {
rtc0 = "/i2c@7000d000/tps6586x@34"; rtc0 = "/i2c@7000d000/tps6586x@34";
rtc1 = "/rtc@7000e000"; rtc1 = "/rtc@7000e000";
serial0 = &uarta;
serial1 = &uartc;
}; };
memory { memory {
......
...@@ -10,6 +10,7 @@ / { ...@@ -10,6 +10,7 @@ / {
aliases { aliases {
rtc0 = "/i2c@7000d000/tps6586x@34"; rtc0 = "/i2c@7000d000/tps6586x@34";
rtc1 = "/rtc@7000e000"; rtc1 = "/rtc@7000e000";
serial0 = &uartd;
}; };
memory { memory {
......
...@@ -7,6 +7,7 @@ / { ...@@ -7,6 +7,7 @@ / {
aliases { aliases {
rtc0 = "/i2c@7000d000/tps6586x@34"; rtc0 = "/i2c@7000d000/tps6586x@34";
rtc1 = "/rtc@7000e000"; rtc1 = "/rtc@7000e000";
serial0 = &uartd;
}; };
memory { memory {
......
...@@ -10,6 +10,7 @@ / { ...@@ -10,6 +10,7 @@ / {
aliases { aliases {
rtc0 = "/i2c@7000c500/rtc@56"; rtc0 = "/i2c@7000c500/rtc@56";
rtc1 = "/rtc@7000e000"; rtc1 = "/rtc@7000e000";
serial0 = &uarta;
}; };
memory { memory {
......
...@@ -10,6 +10,7 @@ / { ...@@ -10,6 +10,7 @@ / {
aliases { aliases {
rtc0 = "/i2c@7000d000/tps6586x@34"; rtc0 = "/i2c@7000d000/tps6586x@34";
rtc1 = "/rtc@7000e000"; rtc1 = "/rtc@7000e000";
serial0 = &uartd;
}; };
memory { memory {
......
...@@ -10,6 +10,7 @@ / { ...@@ -10,6 +10,7 @@ / {
aliases { aliases {
rtc0 = "/i2c@7000d000/max8907@3c"; rtc0 = "/i2c@7000d000/max8907@3c";
rtc1 = "/rtc@7000e000"; rtc1 = "/rtc@7000e000";
serial0 = &uarta;
}; };
memory { memory {
......
...@@ -9,14 +9,6 @@ / { ...@@ -9,14 +9,6 @@ / {
compatible = "nvidia,tegra20"; compatible = "nvidia,tegra20";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
aliases {
serial0 = &uarta;
serial1 = &uartb;
serial2 = &uartc;
serial3 = &uartd;
serial4 = &uarte;
};
host1x@50000000 { host1x@50000000 {
compatible = "nvidia,tegra20-host1x", "simple-bus"; compatible = "nvidia,tegra20-host1x", "simple-bus";
reg = <0x50000000 0x00024000>; reg = <0x50000000 0x00024000>;
......
...@@ -11,6 +11,10 @@ aliases { ...@@ -11,6 +11,10 @@ aliases {
rtc0 = "/i2c@7000c000/rtc@68"; rtc0 = "/i2c@7000c000/rtc@68";
rtc1 = "/i2c@7000d000/tps65911@2d"; rtc1 = "/i2c@7000d000/tps65911@2d";
rtc2 = "/rtc@7000e000"; rtc2 = "/rtc@7000e000";
serial0 = &uarta;
serial1 = &uartb;
serial2 = &uartc;
serial3 = &uartd;
}; };
pcie-controller@00003000 { pcie-controller@00003000 {
......
...@@ -9,6 +9,7 @@ / { ...@@ -9,6 +9,7 @@ / {
aliases { aliases {
rtc0 = "/i2c@7000d000/tps65911@2d"; rtc0 = "/i2c@7000d000/tps65911@2d";
rtc1 = "/rtc@7000e000"; rtc1 = "/rtc@7000e000";
serial0 = &uarta;
}; };
memory { memory {
......
...@@ -30,6 +30,8 @@ / { ...@@ -30,6 +30,8 @@ / {
aliases { aliases {
rtc0 = "/i2c@7000d000/tps65911@2d"; rtc0 = "/i2c@7000d000/tps65911@2d";
rtc1 = "/rtc@7000e000"; rtc1 = "/rtc@7000e000";
serial0 = &uarta;
serial1 = &uartc;
}; };
memory { memory {
......
...@@ -10,6 +10,9 @@ aliases { ...@@ -10,6 +10,9 @@ aliases {
rtc0 = "/i2c@7000c000/rtc@68"; rtc0 = "/i2c@7000c000/rtc@68";
rtc1 = "/i2c@7000d000/tps65911@2d"; rtc1 = "/i2c@7000d000/tps65911@2d";
rtc2 = "/rtc@7000e000"; rtc2 = "/rtc@7000e000";
serial0 = &uarta;
serial1 = &uartb;
serial2 = &uartd;
}; };
host1x@50000000 { host1x@50000000 {
......
...@@ -9,14 +9,6 @@ / { ...@@ -9,14 +9,6 @@ / {
compatible = "nvidia,tegra30"; compatible = "nvidia,tegra30";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
aliases {
serial0 = &uarta;
serial1 = &uartb;
serial2 = &uartc;
serial3 = &uartd;
serial4 = &uarte;
};
pcie-controller@00003000 { pcie-controller@00003000 {
compatible = "nvidia,tegra30-pcie"; compatible = "nvidia,tegra30-pcie";
device_type = "pci"; device_type = "pci";
......
...@@ -217,6 +217,7 @@ CONFIG_I2C_CADENCE=y ...@@ -217,6 +217,7 @@ CONFIG_I2C_CADENCE=y
CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_I2C_DESIGNWARE_PLATFORM=y
CONFIG_I2C_EXYNOS5=y CONFIG_I2C_EXYNOS5=y
CONFIG_I2C_MV64XXX=y CONFIG_I2C_MV64XXX=y
CONFIG_I2C_S3C2410=y
CONFIG_I2C_SIRF=y CONFIG_I2C_SIRF=y
CONFIG_I2C_TEGRA=y CONFIG_I2C_TEGRA=y
CONFIG_I2C_ST=y CONFIG_I2C_ST=y
......
...@@ -455,7 +455,7 @@ enum { ...@@ -455,7 +455,7 @@ enum {
MSTP128, MSTP127, MSTP125, MSTP128, MSTP127, MSTP125,
MSTP116, MSTP111, MSTP100, MSTP117, MSTP116, MSTP111, MSTP100, MSTP117,
MSTP230, MSTP230, MSTP229,
MSTP222, MSTP222,
MSTP218, MSTP217, MSTP216, MSTP214, MSTP218, MSTP217, MSTP216, MSTP214,
MSTP207, MSTP206, MSTP204, MSTP203, MSTP202, MSTP201, MSTP200, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202, MSTP201, MSTP200,
...@@ -474,11 +474,12 @@ static struct clk mstp_clks[MSTP_NR] = { ...@@ -474,11 +474,12 @@ static struct clk mstp_clks[MSTP_NR] = {
[MSTP127] = SH_CLK_MSTP32(&div4_clks[DIV4_S], SMSTPCR1, 27, 0), /* CEU20 */ [MSTP127] = SH_CLK_MSTP32(&div4_clks[DIV4_S], SMSTPCR1, 27, 0), /* CEU20 */
[MSTP125] = SH_CLK_MSTP32(&div6_clks[DIV6_SUB], SMSTPCR1, 25, 0), /* TMU0 */ [MSTP125] = SH_CLK_MSTP32(&div6_clks[DIV6_SUB], SMSTPCR1, 25, 0), /* TMU0 */
[MSTP117] = SH_CLK_MSTP32(&div4_clks[DIV4_B], SMSTPCR1, 17, 0), /* LCDC1 */ [MSTP117] = SH_CLK_MSTP32(&div4_clks[DIV4_B], SMSTPCR1, 17, 0), /* LCDC1 */
[MSTP116] = SH_CLK_MSTP32(&div6_clks[DIV6_SUB], SMSTPCR1, 16, 0), /* IIC0 */ [MSTP116] = SH_CLK_MSTP32(&div4_clks[DIV4_HPP], SMSTPCR1, 16, 0), /* IIC0 */
[MSTP111] = SH_CLK_MSTP32(&div6_clks[DIV6_SUB], SMSTPCR1, 11, 0), /* TMU1 */ [MSTP111] = SH_CLK_MSTP32(&div6_clks[DIV6_SUB], SMSTPCR1, 11, 0), /* TMU1 */
[MSTP100] = SH_CLK_MSTP32(&div4_clks[DIV4_B], SMSTPCR1, 0, 0), /* LCDC0 */ [MSTP100] = SH_CLK_MSTP32(&div4_clks[DIV4_B], SMSTPCR1, 0, 0), /* LCDC0 */
[MSTP230] = SH_CLK_MSTP32(&div6_clks[DIV6_SUB], SMSTPCR2, 30, 0), /* SCIFA6 */ [MSTP230] = SH_CLK_MSTP32(&div6_clks[DIV6_SUB], SMSTPCR2, 30, 0), /* SCIFA6 */
[MSTP229] = SH_CLK_MSTP32(&div4_clks[DIV4_HP], SMSTPCR2, 29, 0), /* INTCA */
[MSTP222] = SH_CLK_MSTP32(&div6_clks[DIV6_SUB], SMSTPCR2, 22, 0), /* SCIFA7 */ [MSTP222] = SH_CLK_MSTP32(&div6_clks[DIV6_SUB], SMSTPCR2, 22, 0), /* SCIFA7 */
[MSTP218] = SH_CLK_MSTP32(&div4_clks[DIV4_HP], SMSTPCR2, 18, 0), /* DMAC1 */ [MSTP218] = SH_CLK_MSTP32(&div4_clks[DIV4_HP], SMSTPCR2, 18, 0), /* DMAC1 */
[MSTP217] = SH_CLK_MSTP32(&div4_clks[DIV4_HP], SMSTPCR2, 17, 0), /* DMAC2 */ [MSTP217] = SH_CLK_MSTP32(&div4_clks[DIV4_HP], SMSTPCR2, 17, 0), /* DMAC2 */
...@@ -575,6 +576,10 @@ static struct clk_lookup lookups[] = { ...@@ -575,6 +576,10 @@ static struct clk_lookup lookups[] = {
CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[MSTP218]), CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[MSTP218]),
CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP222]), CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP222]),
CLKDEV_DEV_ID("e6cd0000.serial", &mstp_clks[MSTP222]), CLKDEV_DEV_ID("e6cd0000.serial", &mstp_clks[MSTP222]),
CLKDEV_DEV_ID("renesas_intc_irqpin.0", &mstp_clks[MSTP229]),
CLKDEV_DEV_ID("renesas_intc_irqpin.1", &mstp_clks[MSTP229]),
CLKDEV_DEV_ID("renesas_intc_irqpin.2", &mstp_clks[MSTP229]),
CLKDEV_DEV_ID("renesas_intc_irqpin.3", &mstp_clks[MSTP229]),
CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP230]), CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP230]),
CLKDEV_DEV_ID("e6cc0000.serial", &mstp_clks[MSTP230]), CLKDEV_DEV_ID("e6cc0000.serial", &mstp_clks[MSTP230]),
......
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
#define SDCKCR 0xE6150074 #define SDCKCR 0xE6150074
#define SD2CKCR 0xE6150078 #define SD2CKCR 0xE6150078
#define SD3CKCR 0xE615007C #define SD3CKCR 0xE615026C
#define MMC0CKCR 0xE6150240 #define MMC0CKCR 0xE6150240
#define MMC1CKCR 0xE6150244 #define MMC1CKCR 0xE6150244
#define SSPCKCR 0xE6150248 #define SSPCKCR 0xE6150248
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/i2c/i2c-sh_mobile.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/serial_sci.h> #include <linux/serial_sci.h>
#include <linux/sh_dma.h> #include <linux/sh_dma.h>
...@@ -192,11 +193,18 @@ static struct resource i2c4_resources[] = { ...@@ -192,11 +193,18 @@ static struct resource i2c4_resources[] = {
}, },
}; };
static struct i2c_sh_mobile_platform_data i2c_platform_data = {
.clks_per_count = 2,
};
static struct platform_device i2c0_device = { static struct platform_device i2c0_device = {
.name = "i2c-sh_mobile", .name = "i2c-sh_mobile",
.id = 0, .id = 0,
.resource = i2c0_resources, .resource = i2c0_resources,
.num_resources = ARRAY_SIZE(i2c0_resources), .num_resources = ARRAY_SIZE(i2c0_resources),
.dev = {
.platform_data = &i2c_platform_data,
},
}; };
static struct platform_device i2c1_device = { static struct platform_device i2c1_device = {
...@@ -204,6 +212,9 @@ static struct platform_device i2c1_device = { ...@@ -204,6 +212,9 @@ static struct platform_device i2c1_device = {
.id = 1, .id = 1,
.resource = i2c1_resources, .resource = i2c1_resources,
.num_resources = ARRAY_SIZE(i2c1_resources), .num_resources = ARRAY_SIZE(i2c1_resources),
.dev = {
.platform_data = &i2c_platform_data,
},
}; };
static struct platform_device i2c2_device = { static struct platform_device i2c2_device = {
...@@ -211,6 +222,9 @@ static struct platform_device i2c2_device = { ...@@ -211,6 +222,9 @@ static struct platform_device i2c2_device = {
.id = 2, .id = 2,
.resource = i2c2_resources, .resource = i2c2_resources,
.num_resources = ARRAY_SIZE(i2c2_resources), .num_resources = ARRAY_SIZE(i2c2_resources),
.dev = {
.platform_data = &i2c_platform_data,
},
}; };
static struct platform_device i2c3_device = { static struct platform_device i2c3_device = {
...@@ -218,6 +232,9 @@ static struct platform_device i2c3_device = { ...@@ -218,6 +232,9 @@ static struct platform_device i2c3_device = {
.id = 3, .id = 3,
.resource = i2c3_resources, .resource = i2c3_resources,
.num_resources = ARRAY_SIZE(i2c3_resources), .num_resources = ARRAY_SIZE(i2c3_resources),
.dev = {
.platform_data = &i2c_platform_data,
},
}; };
static struct platform_device i2c4_device = { static struct platform_device i2c4_device = {
...@@ -225,6 +242,9 @@ static struct platform_device i2c4_device = { ...@@ -225,6 +242,9 @@ static struct platform_device i2c4_device = {
.id = 4, .id = 4,
.resource = i2c4_resources, .resource = i2c4_resources,
.num_resources = ARRAY_SIZE(i2c4_resources), .num_resources = ARRAY_SIZE(i2c4_resources),
.dev = {
.platform_data = &i2c_platform_data,
},
}; };
static const struct sh_dmae_slave_config sh73a0_dmae_slaves[] = { static const struct sh_dmae_slave_config sh73a0_dmae_slaves[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment