Commit 64041417 authored by Linus Torvalds's avatar Linus Torvalds

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

Pull ARM SoC late changes from Kevin Hilman:
 "These are changes that arrived a little late before the merge window,
  or had dependencies on previous branches.

  Highlights:
   - ux500: misc.  cleanup, fixup I2C devices
   - exynos: DT updates for RTC; PM updates
   - at91: DT updates for NAND; new platforms added to generic defconfig
   - sunxi: DT updates: cubieboard2, pinctrl driver, gated clocks
   - highbank: LPAE fixes, select necessary ARM errata
   - omap: PM fixes and improvements; OMAP5 mailbox support
   - omap: basic support for new DRA7xx SoCs"

* tag 'late-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (60 commits)
  ARM: dts: vexpress: Add CCI node to TC2 device-tree
  ARM: EXYNOS: Skip C1 cpuidle state for exynos5440
  ARM: EXYNOS: always enable PM domains support for EXYNOS4X12
  ARM: highbank: clean-up some unused includes
  ARM: sun7i: Enable the A20 clocks in the DTSI
  ARM: sun6i: Enable clock support in the DTSI
  ARM: sun5i: dt: Use the A10s gates in the DTSI
  ARM: at91: at91_dt_defconfig: enable rm9200 support
  ARM: dts: add ADC device tree node for exynos5420/5250
  ARM: dts: Add RTC DT node to Exynos5420 SoC
  ARM: dts: Update the "status" property of RTC DT node for Exynos5250 SoC
  ARM: dts: Fix the RTC DT node name for Exynos5250
  irqchip: mmp: avoid to include irqs head file
  ARM: mmp: avoid to include head file in mach-mmp
  irqchip: mmp: support irqchip
  irqchip: move mmp irq driver
  ARM: OMAP: AM33xx: clock: Add RNG clock data
  ARM: OMAP: TI81XX: add always-on powerdomain for TI81XX
  ARM: OMAP4: clock: Lock PLLs in the right sequence
  ARM: OMAP: AM33XX: hwmod: Add hwmod data for debugSS
  ...
parents fa91515c a2bdc32a
...@@ -557,6 +557,7 @@ config ARCH_MMP ...@@ -557,6 +557,7 @@ config ARCH_MMP
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select GPIO_PXA select GPIO_PXA
select IRQ_DOMAIN select IRQ_DOMAIN
select MULTI_IRQ_HANDLER
select NEED_MACH_GPIO_H select NEED_MACH_GPIO_H
select PINCTRL select PINCTRL
select PLAT_PXA select PLAT_PXA
......
...@@ -231,6 +231,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += \ ...@@ -231,6 +231,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += \
sun5i-a10s-olinuxino-micro.dtb \ sun5i-a10s-olinuxino-micro.dtb \
sun5i-a13-olinuxino.dtb \ sun5i-a13-olinuxino.dtb \
sun6i-a31-colombus.dtb \ sun6i-a31-colombus.dtb \
sun7i-a20-cubieboard2.dtb \
sun7i-a20-olinuxino-micro.dtb sun7i-a20-olinuxino-micro.dtb
dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
tegra20-iris-512.dtb \ tegra20-iris-512.dtb \
......
...@@ -95,7 +95,7 @@ serial@12C30000 { ...@@ -95,7 +95,7 @@ serial@12C30000 {
interrupts = <0 54 0>; interrupts = <0 54 0>;
}; };
rtc { rtc@101E0000 {
compatible = "samsung,s3c6410-rtc"; compatible = "samsung,s3c6410-rtc";
reg = <0x101E0000 0x100>; reg = <0x101E0000 0x100>;
interrupts = <0 43 0>, <0 44 0>; interrupts = <0 43 0>, <0 44 0>;
......
...@@ -538,10 +538,6 @@ timing0: timing@0 { ...@@ -538,10 +538,6 @@ timing0: timing@0 {
}; };
}; };
rtc {
status = "okay";
};
usb_hub_bus { usb_hub_bus {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
......
...@@ -171,10 +171,6 @@ keyboard-controller { ...@@ -171,10 +171,6 @@ keyboard-controller {
}; };
}; };
rtc {
status = "okay";
};
/* /*
* On Snow we've got SIP WiFi and so can keep drive strengths low to * On Snow we've got SIP WiFi and so can keep drive strengths low to
* reduce EMI. * reduce EMI.
......
...@@ -180,9 +180,10 @@ codec@11000000 { ...@@ -180,9 +180,10 @@ codec@11000000 {
clock-names = "mfc"; clock-names = "mfc";
}; };
rtc { rtc@101E0000 {
clocks = <&clock 337>; clocks = <&clock 337>;
clock-names = "rtc"; clock-names = "rtc";
status = "okay";
}; };
tmu@10060000 { tmu@10060000 {
...@@ -638,4 +639,15 @@ fimd@14400000 { ...@@ -638,4 +639,15 @@ fimd@14400000 {
clocks = <&clock 133>, <&clock 339>; clocks = <&clock 133>, <&clock 339>;
clock-names = "sclk_fimd", "fimd"; clock-names = "sclk_fimd", "fimd";
}; };
adc: adc@12D10000 {
compatible = "samsung,exynos-adc-v1";
reg = <0x12D10000 0x100>, <0x10040718 0x4>;
interrupts = <0 106 0>;
clocks = <&clock 303>;
clock-names = "adc";
#io-channel-cells = <1>;
io-channel-ranges;
status = "disabled";
};
}; };
...@@ -180,6 +180,12 @@ pinctrl_4: pinctrl@03860000 { ...@@ -180,6 +180,12 @@ pinctrl_4: pinctrl@03860000 {
interrupts = <0 47 0>; interrupts = <0 47 0>;
}; };
rtc@101E0000 {
clocks = <&clock 317>;
clock-names = "rtc";
status = "okay";
};
serial@12C00000 { serial@12C00000 {
clocks = <&clock 257>, <&clock 128>; clocks = <&clock 257>, <&clock 128>;
clock-names = "uart", "clk_uart_baud0"; clock-names = "uart", "clk_uart_baud0";
...@@ -218,4 +224,15 @@ fimd@14400000 { ...@@ -218,4 +224,15 @@ fimd@14400000 {
clocks = <&clock 147>, <&clock 421>; clocks = <&clock 147>, <&clock 421>;
clock-names = "sclk_fimd", "fimd"; clock-names = "sclk_fimd", "fimd";
}; };
adc: adc@12D10000 {
compatible = "samsung,exynos-adc-v2";
reg = <0x12D10000 0x100>, <0x10040720 0x4>;
interrupts = <0 106 0>;
clocks = <&clock 270>;
clock-names = "adc";
#io-channel-cells = <1>;
io-channel-ranges;
status = "disabled";
};
}; };
...@@ -1034,21 +1034,30 @@ nand0: nand@60000000 { ...@@ -1034,21 +1034,30 @@ nand0: nand@60000000 {
compatible = "atmel,at91rm9200-nand"; compatible = "atmel,at91rm9200-nand";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges;
reg = < 0x60000000 0x01000000 /* EBI CS3 */ reg = < 0x60000000 0x01000000 /* EBI CS3 */
0xffffc070 0x00000490 /* SMC PMECC regs */ 0xffffc070 0x00000490 /* SMC PMECC regs */
0xffffc500 0x00000100 /* SMC PMECC Error Location regs */ 0xffffc500 0x00000100 /* SMC PMECC Error Location regs */
0x00100000 0x00100000 /* ROM code */ 0x00110000 0x00018000 /* ROM code */
0x70000000 0x10000000 /* NFC Command Registers */
0xffffc000 0x00000070 /* NFC HSMC regs */
0x00200000 0x00100000 /* NFC SRAM banks */
>; >;
interrupts = <5 IRQ_TYPE_LEVEL_HIGH 6>; interrupts = <5 IRQ_TYPE_LEVEL_HIGH 6>;
atmel,nand-addr-offset = <21>; atmel,nand-addr-offset = <21>;
atmel,nand-cmd-offset = <22>; atmel,nand-cmd-offset = <22>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_nand0_ale_cle>; pinctrl-0 = <&pinctrl_nand0_ale_cle>;
atmel,pmecc-lookup-table-offset = <0x10000 0x18000>; atmel,pmecc-lookup-table-offset = <0x0 0x8000>;
status = "disabled"; status = "disabled";
nfc@70000000 {
compatible = "atmel,sama5d3-nfc";
#address-cells = <1>;
#size-cells = <1>;
reg = <
0x70000000 0x10000000 /* NFC Command Registers */
0xffffc000 0x00000070 /* NFC HSMC regs */
0x00200000 0x00100000 /* NFC SRAM banks */
>;
};
}; };
}; };
}; };
...@@ -47,8 +47,6 @@ nand0: nand@60000000 { ...@@ -47,8 +47,6 @@ nand0: nand@60000000 {
atmel,has-pmecc; atmel,has-pmecc;
atmel,pmecc-cap = <4>; atmel,pmecc-cap = <4>;
atmel,pmecc-sector-size = <512>; atmel,pmecc-sector-size = <512>;
atmel,has-nfc;
atmel,use-nfc-sram;
nand-on-flash-bbt; nand-on-flash-bbt;
status = "okay"; status = "okay";
......
...@@ -95,20 +95,16 @@ ahb: ahb@01c20054 { ...@@ -95,20 +95,16 @@ ahb: ahb@01c20054 {
ahb_gates: ahb_gates@01c20060 { ahb_gates: ahb_gates@01c20060 {
#clock-cells = <1>; #clock-cells = <1>;
compatible = "allwinner,sun4i-ahb-gates-clk"; compatible = "allwinner,sun5i-a10s-ahb-gates-clk";
reg = <0x01c20060 0x8>; reg = <0x01c20060 0x8>;
clocks = <&ahb>; clocks = <&ahb>;
clock-output-names = "ahb_usb0", "ahb_ehci0", clock-output-names = "ahb_usbotg", "ahb_ehci", "ahb_ohci",
"ahb_ohci0", "ahb_ehci1", "ahb_ohci1", "ahb_ss", "ahb_ss", "ahb_dma", "ahb_bist", "ahb_mmc0",
"ahb_dma", "ahb_bist", "ahb_mmc0", "ahb_mmc1", "ahb_mmc1", "ahb_mmc2", "ahb_nand", "ahb_sdram",
"ahb_mmc2", "ahb_mmc3", "ahb_ms", "ahb_nand", "ahb_emac", "ahb_ts", "ahb_spi0", "ahb_spi1",
"ahb_sdram", "ahb_ace", "ahb_emac", "ahb_ts", "ahb_spi2", "ahb_gps", "ahb_stimer", "ahb_ve",
"ahb_spi0", "ahb_spi1", "ahb_spi2", "ahb_spi3", "ahb_tve", "ahb_lcd", "ahb_csi", "ahb_hdmi",
"ahb_pata", "ahb_sata", "ahb_gps", "ahb_ve", "ahb_de_be", "ahb_de_fe", "ahb_iep", "ahb_mali400";
"ahb_tvd", "ahb_tve0", "ahb_tve1", "ahb_lcd0",
"ahb_lcd1", "ahb_csi0", "ahb_csi1", "ahb_hdmi",
"ahb_de_be0", "ahb_de_be1", "ahb_de_fe0",
"ahb_de_fe1", "ahb_mp", "ahb_mali400";
}; };
apb0: apb0@01c20054 { apb0: apb0@01c20054 {
...@@ -120,12 +116,11 @@ apb0: apb0@01c20054 { ...@@ -120,12 +116,11 @@ apb0: apb0@01c20054 {
apb0_gates: apb0_gates@01c20068 { apb0_gates: apb0_gates@01c20068 {
#clock-cells = <1>; #clock-cells = <1>;
compatible = "allwinner,sun4i-apb0-gates-clk"; compatible = "allwinner,sun5i-a10s-apb0-gates-clk";
reg = <0x01c20068 0x4>; reg = <0x01c20068 0x4>;
clocks = <&apb0>; clocks = <&apb0>;
clock-output-names = "apb0_codec", "apb0_spdif", clock-output-names = "apb0_codec", "apb0_iis", "apb0_pio",
"apb0_ac97", "apb0_iis", "apb0_pio", "apb0_ir0", "apb0_ir", "apb0_keypad";
"apb0_ir1", "apb0_keypad";
}; };
/* dummy is pll62 */ /* dummy is pll62 */
...@@ -145,15 +140,12 @@ apb1: apb1@01c20058 { ...@@ -145,15 +140,12 @@ apb1: apb1@01c20058 {
apb1_gates: apb1_gates@01c2006c { apb1_gates: apb1_gates@01c2006c {
#clock-cells = <1>; #clock-cells = <1>;
compatible = "allwinner,sun4i-apb1-gates-clk"; compatible = "allwinner,sun5i-a10s-apb1-gates-clk";
reg = <0x01c2006c 0x4>; reg = <0x01c2006c 0x4>;
clocks = <&apb1>; clocks = <&apb1>;
clock-output-names = "apb1_i2c0", "apb1_i2c1", clock-output-names = "apb1_i2c0", "apb1_i2c1",
"apb1_i2c2", "apb1_can", "apb1_scr", "apb1_i2c2", "apb1_uart0", "apb1_uart1",
"apb1_ps20", "apb1_ps21", "apb1_uart0", "apb1_uart2", "apb1_uart3";
"apb1_uart1", "apb1_uart2", "apb1_uart3",
"apb1_uart4", "apb1_uart5", "apb1_uart6",
"apb1_uart7";
}; };
}; };
......
...@@ -24,6 +24,8 @@ chosen { ...@@ -24,6 +24,8 @@ chosen {
soc@01c00000 { soc@01c00000 {
uart0: serial@01c28000 { uart0: serial@01c28000 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
status = "okay"; status = "okay";
}; };
}; };
......
...@@ -51,13 +51,137 @@ memory { ...@@ -51,13 +51,137 @@ memory {
clocks { clocks {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <1>;
ranges;
osc: oscillator { osc24M: osc24M {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "fixed-clock"; compatible = "fixed-clock";
clock-frequency = <24000000>; clock-frequency = <24000000>;
}; };
osc32k: osc32k {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <32768>;
};
pll1: pll1@01c20000 {
#clock-cells = <0>;
compatible = "allwinner,sun6i-a31-pll1-clk";
reg = <0x01c20000 0x4>;
clocks = <&osc24M>;
};
/*
* This is a dummy clock, to be used as placeholder on
* other mux clocks when a specific parent clock is not
* yet implemented. It should be dropped when the driver
* is complete.
*/
pll6: pll6 {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <0>;
};
cpu: cpu@01c20050 {
#clock-cells = <0>;
compatible = "allwinner,sun4i-cpu-clk";
reg = <0x01c20050 0x4>;
/*
* PLL1 is listed twice here.
* While it looks suspicious, it's actually documented
* that way both in the datasheet and in the code from
* Allwinner.
*/
clocks = <&osc32k>, <&osc24M>, <&pll1>, <&pll1>;
};
axi: axi@01c20050 {
#clock-cells = <0>;
compatible = "allwinner,sun4i-axi-clk";
reg = <0x01c20050 0x4>;
clocks = <&cpu>;
};
ahb1_mux: ahb1_mux@01c20054 {
#clock-cells = <0>;
compatible = "allwinner,sun6i-a31-ahb1-mux-clk";
reg = <0x01c20054 0x4>;
clocks = <&osc32k>, <&osc24M>, <&axi>, <&pll6>;
};
ahb1: ahb1@01c20054 {
#clock-cells = <0>;
compatible = "allwinner,sun4i-ahb-clk";
reg = <0x01c20054 0x4>;
clocks = <&ahb1_mux>;
};
ahb1_gates: ahb1_gates@01c20060 {
#clock-cells = <1>;
compatible = "allwinner,sun6i-a31-ahb1-gates-clk";
reg = <0x01c20060 0x8>;
clocks = <&ahb1>;
clock-output-names = "ahb1_mipidsi", "ahb1_ss",
"ahb1_dma", "ahb1_mmc0", "ahb1_mmc1",
"ahb1_mmc2", "ahb1_mmc3", "ahb1_nand1",
"ahb1_nand0", "ahb1_sdram",
"ahb1_gmac", "ahb1_ts", "ahb1_hstimer",
"ahb1_spi0", "ahb1_spi1", "ahb1_spi2",
"ahb1_spi3", "ahb1_otg", "ahb1_ehci0",
"ahb1_ehci1", "ahb1_ohci0",
"ahb1_ohci1", "ahb1_ohci2", "ahb1_ve",
"ahb1_lcd0", "ahb1_lcd1", "ahb1_csi",
"ahb1_hdmi", "ahb1_de0", "ahb1_de1",
"ahb1_fe0", "ahb1_fe1", "ahb1_mp",
"ahb1_gpu", "ahb1_deu0", "ahb1_deu1",
"ahb1_drc0", "ahb1_drc1";
};
apb1: apb1@01c20054 {
#clock-cells = <0>;
compatible = "allwinner,sun4i-apb0-clk";
reg = <0x01c20054 0x4>;
clocks = <&ahb1>;
};
apb1_gates: apb1_gates@01c20060 {
#clock-cells = <1>;
compatible = "allwinner,sun6i-a31-apb1-gates-clk";
reg = <0x01c20068 0x4>;
clocks = <&apb1>;
clock-output-names = "apb1_codec", "apb1_digital_mic",
"apb1_pio", "apb1_daudio0",
"apb1_daudio1";
};
apb2_mux: apb2_mux@01c20058 {
#clock-cells = <0>;
compatible = "allwinner,sun4i-apb1-mux-clk";
reg = <0x01c20058 0x4>;
clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>;
};
apb2: apb2@01c20058 {
#clock-cells = <0>;
compatible = "allwinner,sun6i-a31-apb2-div-clk";
reg = <0x01c20058 0x4>;
clocks = <&apb2_mux>;
};
apb2_gates: apb2_gates@01c2006c {
#clock-cells = <1>;
compatible = "allwinner,sun6i-a31-apb2-gates-clk";
reg = <0x01c2006c 0x8>;
clocks = <&apb2>;
clock-output-names = "apb2_i2c0", "apb2_i2c1",
"apb2_i2c2", "apb2_i2c3", "apb2_uart0",
"apb2_uart1", "apb2_uart2", "apb2_uart3",
"apb2_uart4", "apb2_uart5";
};
}; };
soc@01c00000 { soc@01c00000 {
...@@ -66,6 +190,25 @@ soc@01c00000 { ...@@ -66,6 +190,25 @@ soc@01c00000 {
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
pio: pinctrl@01c20800 {
compatible = "allwinner,sun6i-a31-pinctrl";
reg = <0x01c20800 0x400>;
interrupts = <0 11 1>, <0 15 1>, <0 16 1>, <0 17 1>;
clocks = <&apb1_gates 5>;
gpio-controller;
interrupt-controller;
#address-cells = <1>;
#size-cells = <0>;
#gpio-cells = <3>;
uart0_pins_a: uart0@0 {
allwinner,pins = "PH20", "PH21";
allwinner,function = "uart0";
allwinner,drive = <0>;
allwinner,pull = <0>;
};
};
timer@01c20c00 { timer@01c20c00 {
compatible = "allwinner,sun4i-timer"; compatible = "allwinner,sun4i-timer";
reg = <0x01c20c00 0xa0>; reg = <0x01c20c00 0xa0>;
...@@ -74,7 +217,7 @@ timer@01c20c00 { ...@@ -74,7 +217,7 @@ timer@01c20c00 {
<0 20 1>, <0 20 1>,
<0 21 1>, <0 21 1>,
<0 22 1>; <0 22 1>;
clocks = <&osc>; clocks = <&osc24M>;
}; };
wdt1: watchdog@01c20ca0 { wdt1: watchdog@01c20ca0 {
...@@ -88,7 +231,7 @@ uart0: serial@01c28000 { ...@@ -88,7 +231,7 @@ uart0: serial@01c28000 {
interrupts = <0 0 1>; interrupts = <0 0 1>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&osc>; clocks = <&apb2_gates 16>;
status = "disabled"; status = "disabled";
}; };
...@@ -98,7 +241,7 @@ uart1: serial@01c28400 { ...@@ -98,7 +241,7 @@ uart1: serial@01c28400 {
interrupts = <0 1 1>; interrupts = <0 1 1>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&osc>; clocks = <&apb2_gates 17>;
status = "disabled"; status = "disabled";
}; };
...@@ -108,7 +251,7 @@ uart2: serial@01c28800 { ...@@ -108,7 +251,7 @@ uart2: serial@01c28800 {
interrupts = <0 2 1>; interrupts = <0 2 1>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&osc>; clocks = <&apb2_gates 18>;
status = "disabled"; status = "disabled";
}; };
...@@ -118,7 +261,7 @@ uart3: serial@01c28c00 { ...@@ -118,7 +261,7 @@ uart3: serial@01c28c00 {
interrupts = <0 3 1>; interrupts = <0 3 1>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&osc>; clocks = <&apb2_gates 19>;
status = "disabled"; status = "disabled";
}; };
...@@ -128,7 +271,7 @@ uart4: serial@01c29000 { ...@@ -128,7 +271,7 @@ uart4: serial@01c29000 {
interrupts = <0 4 1>; interrupts = <0 4 1>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&osc>; clocks = <&apb2_gates 20>;
status = "disabled"; status = "disabled";
}; };
...@@ -138,7 +281,7 @@ uart5: serial@01c29400 { ...@@ -138,7 +281,7 @@ uart5: serial@01c29400 {
interrupts = <0 5 1>; interrupts = <0 5 1>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&osc>; clocks = <&apb2_gates 21>;
status = "disabled"; status = "disabled";
}; };
......
/*
* Copyright 2013 Maxime Ripard
*
* Maxime Ripard <maxime.ripard@free-electrons.com>
*
* The code contained herein is licensed under the GNU General Public
* License. You may obtain a copy of the GNU General Public License
* Version 2 or later at the following locations:
*
* http://www.opensource.org/licenses/gpl-license.html
* http://www.gnu.org/copyleft/gpl.html
*/
/dts-v1/;
/include/ "sun7i-a20.dtsi"
/ {
model = "Cubietech Cubieboard2";
compatible = "cubietech,cubieboard2", "allwinner,sun7i-a20";
soc@01c00000 {
pinctrl@01c20800 {
led_pins_cubieboard2: led_pins@0 {
allwinner,pins = "PH20", "PH21";
allwinner,function = "gpio_out";
allwinner,drive = <0>;
allwinner,pull = <0>;
};
};
uart0: serial@01c28000 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
status = "okay";
};
};
leds {
compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_cubieboard2>;
blue {
label = "cubieboard2:blue:usr";
gpios = <&pio 7 21 0>;
};
green {
label = "cubieboard2:green:usr";
gpios = <&pio 7 20 0>;
};
};
};
...@@ -19,16 +19,43 @@ / { ...@@ -19,16 +19,43 @@ / {
compatible = "olimex,a20-olinuxino-micro", "allwinner,sun7i-a20"; compatible = "olimex,a20-olinuxino-micro", "allwinner,sun7i-a20";
soc@01c00000 { soc@01c00000 {
pinctrl@01c20800 {
led_pins_olinuxino: led_pins@0 {
allwinner,pins = "PH2";
allwinner,function = "gpio_out";
allwinner,drive = <1>;
allwinner,pull = <0>;
};
};
uart0: serial@01c28000 { uart0: serial@01c28000 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
status = "okay"; status = "okay";
}; };
uart6: serial@01c29800 { uart6: serial@01c29800 {
pinctrl-names = "default";
pinctrl-0 = <&uart6_pins_a>;
status = "okay"; status = "okay";
}; };
uart7: serial@01c29c00 { uart7: serial@01c29c00 {
pinctrl-names = "default";
pinctrl-0 = <&uart7_pins_a>;
status = "okay"; status = "okay";
}; };
}; };
leds {
compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_olinuxino>;
green {
label = "a20-olinuxino-micro:green:usr";
gpios = <&pio 7 2 0>;
default-state = "on";
};
};
}; };
...@@ -44,7 +44,8 @@ clocks { ...@@ -44,7 +44,8 @@ clocks {
osc24M: osc24M@01c20050 { osc24M: osc24M@01c20050 {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "fixed-clock"; compatible = "allwinner,sun4i-osc-clk";
reg = <0x01c20050 0x4>;
clock-frequency = <24000000>; clock-frequency = <24000000>;
}; };
...@@ -53,6 +54,111 @@ osc32k: osc32k { ...@@ -53,6 +54,111 @@ osc32k: osc32k {
compatible = "fixed-clock"; compatible = "fixed-clock";
clock-frequency = <32768>; clock-frequency = <32768>;
}; };
pll1: pll1@01c20000 {
#clock-cells = <0>;
compatible = "allwinner,sun4i-pll1-clk";
reg = <0x01c20000 0x4>;
clocks = <&osc24M>;
};
/*
* This is a dummy clock, to be used as placeholder on
* other mux clocks when a specific parent clock is not
* yet implemented. It should be dropped when the driver
* is complete.
*/
pll6: pll6 {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <0>;
};
cpu: cpu@01c20054 {
#clock-cells = <0>;
compatible = "allwinner,sun4i-cpu-clk";
reg = <0x01c20054 0x4>;
clocks = <&osc32k>, <&osc24M>, <&pll1>, <&pll6>;
};
axi: axi@01c20054 {
#clock-cells = <0>;
compatible = "allwinner,sun4i-axi-clk";
reg = <0x01c20054 0x4>;
clocks = <&cpu>;
};
ahb: ahb@01c20054 {
#clock-cells = <0>;
compatible = "allwinner,sun4i-ahb-clk";
reg = <0x01c20054 0x4>;
clocks = <&axi>;
};
ahb_gates: ahb_gates@01c20060 {
#clock-cells = <1>;
compatible = "allwinner,sun7i-a20-ahb-gates-clk";
reg = <0x01c20060 0x8>;
clocks = <&ahb>;
clock-output-names = "ahb_usb0", "ahb_ehci0",
"ahb_ohci0", "ahb_ehci1", "ahb_ohci1",
"ahb_ss", "ahb_dma", "ahb_bist", "ahb_mmc0",
"ahb_mmc1", "ahb_mmc2", "ahb_mmc3", "ahb_ms",
"ahb_nand", "ahb_sdram", "ahb_ace",
"ahb_emac", "ahb_ts", "ahb_spi0", "ahb_spi1",
"ahb_spi2", "ahb_spi3", "ahb_sata",
"ahb_hstimer", "ahb_ve", "ahb_tvd", "ahb_tve0",
"ahb_tve1", "ahb_lcd0", "ahb_lcd1", "ahb_csi0",
"ahb_csi1", "ahb_hdmi1", "ahb_hdmi0",
"ahb_de_be0", "ahb_de_be1", "ahb_de_fe0",
"ahb_de_fe1", "ahb_gmac", "ahb_mp",
"ahb_mali";
};
apb0: apb0@01c20054 {
#clock-cells = <0>;
compatible = "allwinner,sun4i-apb0-clk";
reg = <0x01c20054 0x4>;
clocks = <&ahb>;
};
apb0_gates: apb0_gates@01c20068 {
#clock-cells = <1>;
compatible = "allwinner,sun7i-a20-apb0-gates-clk";
reg = <0x01c20068 0x4>;
clocks = <&apb0>;
clock-output-names = "apb0_codec", "apb0_spdif",
"apb0_ac97", "apb0_iis0", "apb0_iis1",
"apb0_pio", "apb0_ir0", "apb0_ir1",
"apb0_iis2", "apb0_keypad";
};
apb1_mux: apb1_mux@01c20058 {
#clock-cells = <0>;
compatible = "allwinner,sun4i-apb1-mux-clk";
reg = <0x01c20058 0x4>;
clocks = <&osc24M>, <&pll6>, <&osc32k>;
};
apb1: apb1@01c20058 {
#clock-cells = <0>;
compatible = "allwinner,sun4i-apb1-clk";
reg = <0x01c20058 0x4>;
clocks = <&apb1_mux>;
};
apb1_gates: apb1_gates@01c2006c {
#clock-cells = <1>;
compatible = "allwinner,sun7i-a20-apb1-gates-clk";
reg = <0x01c2006c 0x4>;
clocks = <&apb1>;
clock-output-names = "apb1_i2c0", "apb1_i2c1",
"apb1_i2c2", "apb1_i2c3", "apb1_can",
"apb1_scr", "apb1_ps20", "apb1_ps21",
"apb1_i2c4", "apb1_uart0", "apb1_uart1",
"apb1_uart2", "apb1_uart3", "apb1_uart4",
"apb1_uart5", "apb1_uart6", "apb1_uart7";
};
}; };
soc@01c00000 { soc@01c00000 {
...@@ -61,6 +167,39 @@ soc@01c00000 { ...@@ -61,6 +167,39 @@ soc@01c00000 {
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
pio: pinctrl@01c20800 {
compatible = "allwinner,sun7i-a20-pinctrl";
reg = <0x01c20800 0x400>;
interrupts = <0 28 1>;
clocks = <&apb0_gates 5>;
gpio-controller;
interrupt-controller;
#address-cells = <1>;
#size-cells = <0>;
#gpio-cells = <3>;
uart0_pins_a: uart0@0 {
allwinner,pins = "PB22", "PB23";
allwinner,function = "uart0";
allwinner,drive = <0>;
allwinner,pull = <0>;
};
uart6_pins_a: uart6@0 {
allwinner,pins = "PI12", "PI13";
allwinner,function = "uart6";
allwinner,drive = <0>;
allwinner,pull = <0>;
};
uart7_pins_a: uart7@0 {
allwinner,pins = "PI20", "PI21";
allwinner,function = "uart7";
allwinner,drive = <0>;
allwinner,pull = <0>;
};
};
timer@01c20c00 { timer@01c20c00 {
compatible = "allwinner,sun4i-timer"; compatible = "allwinner,sun4i-timer";
reg = <0x01c20c00 0x90>; reg = <0x01c20c00 0x90>;
...@@ -84,7 +223,7 @@ uart0: serial@01c28000 { ...@@ -84,7 +223,7 @@ uart0: serial@01c28000 {
interrupts = <0 1 1>; interrupts = <0 1 1>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&osc24M>; clocks = <&apb1_gates 16>;
status = "disabled"; status = "disabled";
}; };
...@@ -94,7 +233,7 @@ uart1: serial@01c28400 { ...@@ -94,7 +233,7 @@ uart1: serial@01c28400 {
interrupts = <0 2 1>; interrupts = <0 2 1>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&osc24M>; clocks = <&apb1_gates 17>;
status = "disabled"; status = "disabled";
}; };
...@@ -104,7 +243,7 @@ uart2: serial@01c28800 { ...@@ -104,7 +243,7 @@ uart2: serial@01c28800 {
interrupts = <0 3 1>; interrupts = <0 3 1>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&osc24M>; clocks = <&apb1_gates 18>;
status = "disabled"; status = "disabled";
}; };
...@@ -114,7 +253,7 @@ uart3: serial@01c28c00 { ...@@ -114,7 +253,7 @@ uart3: serial@01c28c00 {
interrupts = <0 4 1>; interrupts = <0 4 1>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&osc24M>; clocks = <&apb1_gates 19>;
status = "disabled"; status = "disabled";
}; };
...@@ -124,7 +263,7 @@ uart4: serial@01c29000 { ...@@ -124,7 +263,7 @@ uart4: serial@01c29000 {
interrupts = <0 17 1>; interrupts = <0 17 1>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&osc24M>; clocks = <&apb1_gates 20>;
status = "disabled"; status = "disabled";
}; };
...@@ -134,7 +273,7 @@ uart5: serial@01c29400 { ...@@ -134,7 +273,7 @@ uart5: serial@01c29400 {
interrupts = <0 18 1>; interrupts = <0 18 1>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&osc24M>; clocks = <&apb1_gates 21>;
status = "disabled"; status = "disabled";
}; };
...@@ -144,7 +283,7 @@ uart6: serial@01c29800 { ...@@ -144,7 +283,7 @@ uart6: serial@01c29800 {
interrupts = <0 19 1>; interrupts = <0 19 1>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&osc24M>; clocks = <&apb1_gates 22>;
status = "disabled"; status = "disabled";
}; };
...@@ -154,7 +293,7 @@ uart7: serial@01c29c00 { ...@@ -154,7 +293,7 @@ uart7: serial@01c29c00 {
interrupts = <0 20 1>; interrupts = <0 20 1>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&osc24M>; clocks = <&apb1_gates 23>;
status = "disabled"; status = "disabled";
}; };
......
...@@ -37,30 +37,35 @@ cpu0: cpu@0 { ...@@ -37,30 +37,35 @@ cpu0: cpu@0 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a15"; compatible = "arm,cortex-a15";
reg = <0>; reg = <0>;
cci-control-port = <&cci_control1>;
}; };
cpu1: cpu@1 { cpu1: cpu@1 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a15"; compatible = "arm,cortex-a15";
reg = <1>; reg = <1>;
cci-control-port = <&cci_control1>;
}; };
cpu2: cpu@2 { cpu2: cpu@2 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a7"; compatible = "arm,cortex-a7";
reg = <0x100>; reg = <0x100>;
cci-control-port = <&cci_control2>;
}; };
cpu3: cpu@3 { cpu3: cpu@3 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a7"; compatible = "arm,cortex-a7";
reg = <0x101>; reg = <0x101>;
cci-control-port = <&cci_control2>;
}; };
cpu4: cpu@4 { cpu4: cpu@4 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a7"; compatible = "arm,cortex-a7";
reg = <0x102>; reg = <0x102>;
cci-control-port = <&cci_control2>;
}; };
}; };
...@@ -104,6 +109,26 @@ gic: interrupt-controller@2c001000 { ...@@ -104,6 +109,26 @@ gic: interrupt-controller@2c001000 {
interrupts = <1 9 0xf04>; interrupts = <1 9 0xf04>;
}; };
cci@2c090000 {
compatible = "arm,cci-400";
#address-cells = <1>;
#size-cells = <1>;
reg = <0 0x2c090000 0 0x1000>;
ranges = <0x0 0x0 0x2c090000 0x10000>;
cci_control1: slave-if@4000 {
compatible = "arm,cci-400-ctrl-if";
interface-type = "ace";
reg = <0x4000 0x1000>;
};
cci_control2: slave-if@5000 {
compatible = "arm,cci-400-ctrl-if";
interface-type = "ace";
reg = <0x5000 0x1000>;
};
};
memory-controller@7ffd0000 { memory-controller@7ffd0000 {
compatible = "arm,pl354", "arm,primecell"; compatible = "arm,pl354", "arm,primecell";
reg = <0 0x7ffd0000 0 0x1000>; reg = <0 0x7ffd0000 0 0x1000>;
......
...@@ -14,11 +14,13 @@ CONFIG_MODULE_UNLOAD=y ...@@ -14,11 +14,13 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IOSCHED_CFQ is not set # CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_AT91=y CONFIG_ARCH_AT91=y
CONFIG_SOC_AT91RM9200=y
CONFIG_SOC_AT91SAM9260=y CONFIG_SOC_AT91SAM9260=y
CONFIG_SOC_AT91SAM9263=y CONFIG_SOC_AT91SAM9263=y
CONFIG_SOC_AT91SAM9G45=y CONFIG_SOC_AT91SAM9G45=y
CONFIG_SOC_AT91SAM9X5=y CONFIG_SOC_AT91SAM9X5=y
CONFIG_SOC_AT91SAM9N12=y CONFIG_SOC_AT91SAM9N12=y
CONFIG_MACH_AT91RM9200_DT=y
CONFIG_MACH_AT91SAM9_DT=y CONFIG_MACH_AT91SAM9_DT=y
CONFIG_AT91_PROGRAMMABLE_CLOCKS=y CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
CONFIG_AT91_TIMER_HZ=128 CONFIG_AT91_TIMER_HZ=128
...@@ -62,6 +64,7 @@ CONFIG_MTD=y ...@@ -62,6 +64,7 @@ CONFIG_MTD=y
CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_CHAR=y CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y CONFIG_MTD_BLOCK=y
CONFIG_MTD_DATAFLASH=y
CONFIG_MTD_NAND=y CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_ATMEL=y CONFIG_MTD_NAND_ATMEL=y
CONFIG_MTD_UBI=y CONFIG_MTD_UBI=y
...@@ -78,7 +81,6 @@ CONFIG_BLK_DEV_SD=y ...@@ -78,7 +81,6 @@ CONFIG_BLK_DEV_SD=y
CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_LOWLEVEL is not set # CONFIG_SCSI_LOWLEVEL is not set
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_MII=y
CONFIG_MACB=y CONFIG_MACB=y
# CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_VENDOR_FARADAY is not set # CONFIG_NET_VENDOR_FARADAY is not set
......
...@@ -35,7 +35,7 @@ struct machine_desc { ...@@ -35,7 +35,7 @@ struct machine_desc {
unsigned int nr_irqs; /* number of IRQs */ unsigned int nr_irqs; /* number of IRQs */
#ifdef CONFIG_ZONE_DMA #ifdef CONFIG_ZONE_DMA
unsigned long dma_zone_size; /* size of DMA-able area */ phys_addr_t dma_zone_size; /* size of DMA-able area */
#endif #endif
unsigned int video_start; /* start of video RAM */ unsigned int video_start; /* start of video RAM */
......
...@@ -37,10 +37,10 @@ struct outer_cache_fns { ...@@ -37,10 +37,10 @@ struct outer_cache_fns {
void (*resume)(void); void (*resume)(void);
}; };
#ifdef CONFIG_OUTER_CACHE
extern struct outer_cache_fns outer_cache; extern struct outer_cache_fns outer_cache;
#ifdef CONFIG_OUTER_CACHE
static inline void outer_inv_range(phys_addr_t start, phys_addr_t end) static inline void outer_inv_range(phys_addr_t start, phys_addr_t end)
{ {
if (outer_cache.inv_range) if (outer_cache.inv_range)
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <mach/at91sam9g45.h> #include <mach/at91sam9g45.h>
#include <mach/at91sam9x5.h> #include <mach/at91sam9x5.h>
#include <mach/at91sam9n12.h> #include <mach/at91sam9n12.h>
#include <mach/sama5d3.h>
/* /*
* On all at91 except rm9200 and x40 have the System Controller starts * On all at91 except rm9200 and x40 have the System Controller starts
......
...@@ -64,6 +64,14 @@ ...@@ -64,6 +64,14 @@
#define SAMA5D3_ID_TRNG 45 /* True Random Generator Number */ #define SAMA5D3_ID_TRNG 45 /* True Random Generator Number */
#define SAMA5D3_ID_IRQ0 47 /* Advanced Interrupt Controller (IRQ0) */ #define SAMA5D3_ID_IRQ0 47 /* Advanced Interrupt Controller (IRQ0) */
/*
* User Peripheral physical base addresses.
*/
#define SAMA5D3_BASE_USART0 0xf001c000
#define SAMA5D3_BASE_USART1 0xf0020000
#define SAMA5D3_BASE_USART2 0xf8020000
#define SAMA5D3_BASE_USART3 0xf8024000
/* /*
* Internal Memory * Internal Memory
*/ */
......
...@@ -94,6 +94,15 @@ static const u32 uarts_sam9x5[] = { ...@@ -94,6 +94,15 @@ static const u32 uarts_sam9x5[] = {
0, 0,
}; };
static const u32 uarts_sama5[] = {
AT91_BASE_DBGU1,
SAMA5D3_BASE_USART0,
SAMA5D3_BASE_USART1,
SAMA5D3_BASE_USART2,
SAMA5D3_BASE_USART3,
0,
};
static inline const u32* decomp_soc_detect(void __iomem *dbgu_base) static inline const u32* decomp_soc_detect(void __iomem *dbgu_base)
{ {
u32 cidr, socid; u32 cidr, socid;
...@@ -121,8 +130,12 @@ static inline const u32* decomp_soc_detect(void __iomem *dbgu_base) ...@@ -121,8 +130,12 @@ static inline const u32* decomp_soc_detect(void __iomem *dbgu_base)
case ARCH_ID_AT91SAM9RL64: case ARCH_ID_AT91SAM9RL64:
return uarts_sam9rl; return uarts_sam9rl;
case ARCH_ID_AT91SAM9N12:
case ARCH_ID_AT91SAM9X5: case ARCH_ID_AT91SAM9X5:
return uarts_sam9x5; return uarts_sam9x5;
case ARCH_ID_SAMA5D3:
return uarts_sama5;
} }
/* at91sam9g10 */ /* at91sam9g10 */
......
...@@ -36,6 +36,7 @@ config CPU_EXYNOS4210 ...@@ -36,6 +36,7 @@ config CPU_EXYNOS4210
bool "SAMSUNG EXYNOS4210" bool "SAMSUNG EXYNOS4210"
default y default y
depends on ARCH_EXYNOS4 depends on ARCH_EXYNOS4
select ARCH_HAS_BANDGAP
select ARM_CPU_SUSPEND if PM select ARM_CPU_SUSPEND if PM
select PINCTRL_EXYNOS select PINCTRL_EXYNOS
select PM_GENERIC_DOMAINS if PM select PM_GENERIC_DOMAINS if PM
...@@ -49,7 +50,9 @@ config SOC_EXYNOS4212 ...@@ -49,7 +50,9 @@ config SOC_EXYNOS4212
bool "SAMSUNG EXYNOS4212" bool "SAMSUNG EXYNOS4212"
default y default y
depends on ARCH_EXYNOS4 depends on ARCH_EXYNOS4
select ARCH_HAS_BANDGAP
select PINCTRL_EXYNOS select PINCTRL_EXYNOS
select PM_GENERIC_DOMAINS if PM
select S5P_PM if PM select S5P_PM if PM
select S5P_SLEEP if PM select S5P_SLEEP if PM
select SAMSUNG_DMADEV select SAMSUNG_DMADEV
...@@ -60,7 +63,9 @@ config SOC_EXYNOS4412 ...@@ -60,7 +63,9 @@ config SOC_EXYNOS4412
bool "SAMSUNG EXYNOS4412" bool "SAMSUNG EXYNOS4412"
default y default y
depends on ARCH_EXYNOS4 depends on ARCH_EXYNOS4
select ARCH_HAS_BANDGAP
select PINCTRL_EXYNOS select PINCTRL_EXYNOS
select PM_GENERIC_DOMAINS if PM
select SAMSUNG_DMADEV select SAMSUNG_DMADEV
help help
Enable EXYNOS4412 SoC support Enable EXYNOS4412 SoC support
...@@ -69,6 +74,7 @@ config SOC_EXYNOS5250 ...@@ -69,6 +74,7 @@ config SOC_EXYNOS5250
bool "SAMSUNG EXYNOS5250" bool "SAMSUNG EXYNOS5250"
default y default y
depends on ARCH_EXYNOS5 depends on ARCH_EXYNOS5
select ARCH_HAS_BANDGAP
select PINCTRL_EXYNOS select PINCTRL_EXYNOS
select PM_GENERIC_DOMAINS if PM select PM_GENERIC_DOMAINS if PM
select S5P_PM if PM select S5P_PM if PM
...@@ -93,6 +99,7 @@ config SOC_EXYNOS5440 ...@@ -93,6 +99,7 @@ config SOC_EXYNOS5440
default y default y
depends on ARCH_EXYNOS5 depends on ARCH_EXYNOS5
select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
select ARCH_HAS_BANDGAP
select ARCH_HAS_OPP select ARCH_HAS_OPP
select HAVE_ARM_ARCH_TIMER select HAVE_ARM_ARCH_TIMER
select AUTO_ZRELADDR select AUTO_ZRELADDR
......
...@@ -200,6 +200,9 @@ static int __init exynos4_init_cpuidle(void) ...@@ -200,6 +200,9 @@ static int __init exynos4_init_cpuidle(void)
if (soc_is_exynos5250()) if (soc_is_exynos5250())
exynos5_core_down_clk(); exynos5_core_down_clk();
if (soc_is_exynos5440())
exynos4_idle_driver.state_count = 1;
ret = cpuidle_register_driver(&exynos4_idle_driver); ret = cpuidle_register_driver(&exynos4_idle_driver);
if (ret) { if (ret) {
printk(KERN_ERR "CPUidle failed to register driver\n"); printk(KERN_ERR "CPUidle failed to register driver\n");
......
config ARCH_HIGHBANK config ARCH_HIGHBANK
bool "Calxeda ECX-1000/2000 (Highbank/Midway)" if ARCH_MULTI_V7 bool "Calxeda ECX-1000/2000 (Highbank/Midway)" if ARCH_MULTI_V7
select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
select ARCH_HAS_CPUFREQ select ARCH_HAS_CPUFREQ
select ARCH_HAS_HOLES_MEMORYMODEL
select ARCH_HAS_OPP select ARCH_HAS_OPP
select ARCH_WANT_OPTIONAL_GPIOLIB select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_AMBA select ARM_AMBA
select ARM_ERRATA_764369
select ARM_ERRATA_775420
select ARM_ERRATA_798181
select ARM_GIC select ARM_GIC
select ARM_TIMER_SP804 select ARM_TIMER_SP804
select CACHE_L2X0 select CACHE_L2X0
...@@ -18,3 +23,4 @@ config ARCH_HIGHBANK ...@@ -18,3 +23,4 @@ config ARCH_HIGHBANK
select PL320_MBOX select PL320_MBOX
select SPARSE_IRQ select SPARSE_IRQ
select USE_OF select USE_OF
select ZONE_DMA if ARM_LPAE
...@@ -18,14 +18,11 @@ ...@@ -18,14 +18,11 @@
#include <linux/clocksource.h> #include <linux/clocksource.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/irq.h>
#include <linux/irqchip.h> #include <linux/irqchip.h>
#include <linux/irqdomain.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/of_address.h> #include <linux/of_address.h>
#include <linux/smp.h>
#include <linux/amba/bus.h> #include <linux/amba/bus.h>
#include <linux/clk-provider.h> #include <linux/clk-provider.h>
...@@ -35,7 +32,6 @@ ...@@ -35,7 +32,6 @@
#include <asm/hardware/cache-l2x0.h> #include <asm/hardware/cache-l2x0.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/time.h>
#include "core.h" #include "core.h"
#include "sysregs.h" #include "sysregs.h"
...@@ -65,13 +61,11 @@ void highbank_set_cpu_jump(int cpu, void *jump_addr) ...@@ -65,13 +61,11 @@ void highbank_set_cpu_jump(int cpu, void *jump_addr)
HB_JUMP_TABLE_PHYS(cpu) + 15); HB_JUMP_TABLE_PHYS(cpu) + 15);
} }
#ifdef CONFIG_CACHE_L2X0
static void highbank_l2x0_disable(void) static void highbank_l2x0_disable(void)
{ {
/* Disable PL310 L2 Cache controller */ /* Disable PL310 L2 Cache controller */
highbank_smc1(0x102, 0x0); highbank_smc1(0x102, 0x0);
} }
#endif
static void __init highbank_init_irq(void) static void __init highbank_init_irq(void)
{ {
...@@ -80,12 +74,13 @@ static void __init highbank_init_irq(void) ...@@ -80,12 +74,13 @@ static void __init highbank_init_irq(void)
if (of_find_compatible_node(NULL, NULL, "arm,cortex-a9")) if (of_find_compatible_node(NULL, NULL, "arm,cortex-a9"))
highbank_scu_map_io(); highbank_scu_map_io();
#ifdef CONFIG_CACHE_L2X0
/* Enable PL310 L2 Cache controller */ /* Enable PL310 L2 Cache controller */
highbank_smc1(0x102, 0x1); if (IS_ENABLED(CONFIG_CACHE_L2X0) &&
l2x0_of_init(0, ~0UL); of_find_compatible_node(NULL, NULL, "arm,pl310-cache")) {
outer_cache.disable = highbank_l2x0_disable; highbank_smc1(0x102, 0x1);
#endif l2x0_of_init(0, ~0UL);
outer_cache.disable = highbank_l2x0_disable;
}
} }
static void __init highbank_timer_init(void) static void __init highbank_timer_init(void)
...@@ -176,6 +171,9 @@ static const char *highbank_match[] __initconst = { ...@@ -176,6 +171,9 @@ static const char *highbank_match[] __initconst = {
}; };
DT_MACHINE_START(HIGHBANK, "Highbank") DT_MACHINE_START(HIGHBANK, "Highbank")
#if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)
.dma_zone_size = (4ULL * SZ_1G),
#endif
.smp = smp_ops(highbank_smp_ops), .smp = smp_ops(highbank_smp_ops),
.init_irq = highbank_init_irq, .init_irq = highbank_init_irq,
.init_time = highbank_timer_init, .init_time = highbank_timer_init,
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Makefile for Marvell's PXA168 processors line # Makefile for Marvell's PXA168 processors line
# #
obj-y += common.o devices.o time.o irq.o obj-y += common.o devices.o time.o
# SoC support # SoC support
obj-$(CONFIG_CPU_PXA168) += pxa168.o obj-$(CONFIG_CPU_PXA168) += pxa168.o
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
extern void timer_init(int irq); extern void timer_init(int irq);
extern void __init icu_init_irq(void);
extern void __init mmp_map_io(void); extern void __init mmp_map_io(void);
extern void mmp_restart(enum reboot_mode, const char *); extern void mmp_restart(enum reboot_mode, const char *);
extern void __init pxa168_clk_init(void); extern void __init pxa168_clk_init(void);
......
/*
* linux/arch/arm/mach-mmp/include/mach/entry-macro.S
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#include <asm/irq.h>
#include <mach/regs-icu.h>
.macro get_irqnr_preamble, base, tmp
mrc p15, 0, \tmp, c0, c0, 0 @ CPUID
and \tmp, \tmp, #0xff00
cmp \tmp, #0x5800
ldr \base, =mmp_icu_base
ldr \base, [\base, #0]
addne \base, \base, #0x10c @ PJ1 AP INT SEL register
addeq \base, \base, #0x104 @ PJ4 IRQ SEL register
.endm
.macro get_irqnr_and_base, irqnr, irqstat, base, tmp
ldr \tmp, [\base, #0]
and \irqnr, \tmp, #0x3f
tst \tmp, #(1 << 6)
.endm
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <linux/reboot.h> #include <linux/reboot.h>
extern void pxa168_timer_init(void); extern void pxa168_timer_init(void);
extern void __init icu_init_irq(void);
extern void __init pxa168_init_irq(void); extern void __init pxa168_init_irq(void);
extern void pxa168_restart(enum reboot_mode, const char *); extern void pxa168_restart(enum reboot_mode, const char *);
extern void pxa168_clear_keypad_wakeup(void); extern void pxa168_clear_keypad_wakeup(void);
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#define __ASM_MACH_PXA910_H #define __ASM_MACH_PXA910_H
extern void pxa910_timer_init(void); extern void pxa910_timer_init(void);
extern void __init icu_init_irq(void);
extern void __init pxa910_init_irq(void); extern void __init pxa910_init_irq(void);
#include <linux/i2c.h> #include <linux/i2c.h>
......
...@@ -9,17 +9,13 @@ ...@@ -9,17 +9,13 @@
* publishhed by the Free Software Foundation. * publishhed by the Free Software Foundation.
*/ */
#include <linux/irq.h> #include <linux/irqchip.h>
#include <linux/irqdomain.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/irqs.h>
#include "common.h" #include "common.h"
extern void __init mmp_dt_irq_init(void);
extern void __init mmp_dt_init_timer(void); extern void __init mmp_dt_init_timer(void);
static const struct of_dev_auxdata pxa168_auxdata_lookup[] __initconst = { static const struct of_dev_auxdata pxa168_auxdata_lookup[] __initconst = {
...@@ -64,7 +60,6 @@ static const char *mmp_dt_board_compat[] __initdata = { ...@@ -64,7 +60,6 @@ static const char *mmp_dt_board_compat[] __initdata = {
DT_MACHINE_START(PXA168_DT, "Marvell PXA168 (Device Tree Support)") DT_MACHINE_START(PXA168_DT, "Marvell PXA168 (Device Tree Support)")
.map_io = mmp_map_io, .map_io = mmp_map_io,
.init_irq = mmp_dt_irq_init,
.init_time = mmp_dt_init_timer, .init_time = mmp_dt_init_timer,
.init_machine = pxa168_dt_init, .init_machine = pxa168_dt_init,
.dt_compat = mmp_dt_board_compat, .dt_compat = mmp_dt_board_compat,
...@@ -72,7 +67,6 @@ MACHINE_END ...@@ -72,7 +67,6 @@ MACHINE_END
DT_MACHINE_START(PXA910_DT, "Marvell PXA910 (Device Tree Support)") DT_MACHINE_START(PXA910_DT, "Marvell PXA910 (Device Tree Support)")
.map_io = mmp_map_io, .map_io = mmp_map_io,
.init_irq = mmp_dt_irq_init,
.init_time = mmp_dt_init_timer, .init_time = mmp_dt_init_timer,
.init_machine = pxa910_dt_init, .init_machine = pxa910_dt_init,
.dt_compat = mmp_dt_board_compat, .dt_compat = mmp_dt_board_compat,
......
...@@ -10,18 +10,13 @@ ...@@ -10,18 +10,13 @@
*/ */
#include <linux/io.h> #include <linux/io.h>
#include <linux/irq.h> #include <linux/irqchip.h>
#include <linux/irqdomain.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/irqs.h>
#include <mach/regs-apbc.h>
#include "common.h" #include "common.h"
extern void __init mmp_dt_irq_init(void);
extern void __init mmp_dt_init_timer(void); extern void __init mmp_dt_init_timer(void);
static const struct of_dev_auxdata mmp2_auxdata_lookup[] __initconst = { static const struct of_dev_auxdata mmp2_auxdata_lookup[] __initconst = {
...@@ -49,7 +44,6 @@ static const char *mmp2_dt_board_compat[] __initdata = { ...@@ -49,7 +44,6 @@ static const char *mmp2_dt_board_compat[] __initdata = {
DT_MACHINE_START(MMP2_DT, "Marvell MMP2 (Device Tree Support)") DT_MACHINE_START(MMP2_DT, "Marvell MMP2 (Device Tree Support)")
.map_io = mmp_map_io, .map_io = mmp_map_io,
.init_irq = mmp_dt_irq_init,
.init_time = mmp_dt_init_timer, .init_time = mmp_dt_init_timer,
.init_machine = mmp2_dt_init, .init_machine = mmp2_dt_init,
.dt_compat = mmp2_dt_board_compat, .dt_compat = mmp2_dt_board_compat,
......
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/irq.h>
#include <linux/irqchip/mmp.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <asm/hardware/cache-tauros2.h> #include <asm/hardware/cache-tauros2.h>
...@@ -26,6 +28,7 @@ ...@@ -26,6 +28,7 @@
#include <mach/mfp.h> #include <mach/mfp.h>
#include <mach/devices.h> #include <mach/devices.h>
#include <mach/mmp2.h> #include <mach/mmp2.h>
#include <mach/pm-mmp2.h>
#include "common.h" #include "common.h"
...@@ -94,6 +97,9 @@ void mmp2_clear_pmic_int(void) ...@@ -94,6 +97,9 @@ void mmp2_clear_pmic_int(void)
void __init mmp2_init_irq(void) void __init mmp2_init_irq(void)
{ {
mmp2_init_icu(); mmp2_init_icu();
#ifdef CONFIG_PM
icu_irq_chip.irq_set_wake = mmp2_set_wake;
#endif
} }
static int __init mmp2_init(void) static int __init mmp2_init(void)
......
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/irq.h>
#include <linux/irqchip/mmp.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <asm/hardware/cache-tauros2.h> #include <asm/hardware/cache-tauros2.h>
...@@ -23,6 +25,8 @@ ...@@ -23,6 +25,8 @@
#include <mach/dma.h> #include <mach/dma.h>
#include <mach/mfp.h> #include <mach/mfp.h>
#include <mach/devices.h> #include <mach/devices.h>
#include <mach/pm-pxa910.h>
#include <mach/pxa910.h>
#include "common.h" #include "common.h"
...@@ -79,6 +83,9 @@ static struct mfp_addr_map pxa910_mfp_addr_map[] __initdata = ...@@ -79,6 +83,9 @@ static struct mfp_addr_map pxa910_mfp_addr_map[] __initdata =
void __init pxa910_init_irq(void) void __init pxa910_init_irq(void)
{ {
icu_init_irq(); icu_init_irq();
#ifdef CONFIG_PM
icu_irq_chip.irq_set_wake = pxa910_set_wake;
#endif
} }
static int __init pxa910_init(void) static int __init pxa910_init(void)
......
...@@ -63,6 +63,7 @@ obj-$(CONFIG_SOC_AM33XX) += am33xx-restart.o ...@@ -63,6 +63,7 @@ obj-$(CONFIG_SOC_AM33XX) += am33xx-restart.o
obj-$(CONFIG_ARCH_OMAP3) += omap3-restart.o obj-$(CONFIG_ARCH_OMAP3) += omap3-restart.o
obj-$(CONFIG_ARCH_OMAP4) += omap4-restart.o obj-$(CONFIG_ARCH_OMAP4) += omap4-restart.o
obj-$(CONFIG_SOC_OMAP5) += omap4-restart.o obj-$(CONFIG_SOC_OMAP5) += omap4-restart.o
obj-$(CONFIG_SOC_DRA7XX) += omap4-restart.o
# Pin multiplexing # Pin multiplexing
obj-$(CONFIG_SOC_OMAP2420) += mux2420.o obj-$(CONFIG_SOC_OMAP2420) += mux2420.o
...@@ -148,6 +149,7 @@ obj-$(CONFIG_SOC_AM43XX) += $(powerdomain-common) ...@@ -148,6 +149,7 @@ obj-$(CONFIG_SOC_AM43XX) += $(powerdomain-common)
obj-$(CONFIG_SOC_OMAP5) += $(powerdomain-common) obj-$(CONFIG_SOC_OMAP5) += $(powerdomain-common)
obj-$(CONFIG_SOC_OMAP5) += powerdomains54xx_data.o obj-$(CONFIG_SOC_OMAP5) += powerdomains54xx_data.o
obj-$(CONFIG_SOC_DRA7XX) += $(powerdomain-common) obj-$(CONFIG_SOC_DRA7XX) += $(powerdomain-common)
obj-$(CONFIG_SOC_DRA7XX) += powerdomains7xx_data.o
# PRCM clockdomain control # PRCM clockdomain control
clockdomain-common += clockdomain.o clockdomain-common += clockdomain.o
...@@ -166,6 +168,7 @@ obj-$(CONFIG_SOC_AM43XX) += $(clockdomain-common) ...@@ -166,6 +168,7 @@ obj-$(CONFIG_SOC_AM43XX) += $(clockdomain-common)
obj-$(CONFIG_SOC_OMAP5) += $(clockdomain-common) obj-$(CONFIG_SOC_OMAP5) += $(clockdomain-common)
obj-$(CONFIG_SOC_OMAP5) += clockdomains54xx_data.o obj-$(CONFIG_SOC_OMAP5) += clockdomains54xx_data.o
obj-$(CONFIG_SOC_DRA7XX) += $(clockdomain-common) obj-$(CONFIG_SOC_DRA7XX) += $(clockdomain-common)
obj-$(CONFIG_SOC_DRA7XX) += clockdomains7xx_data.o
# Clock framework # Clock framework
obj-$(CONFIG_ARCH_OMAP2) += $(clock-common) clock2xxx.o obj-$(CONFIG_ARCH_OMAP2) += $(clock-common) clock2xxx.o
...@@ -209,6 +212,7 @@ obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_3xxx_data.o ...@@ -209,6 +212,7 @@ obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_3xxx_data.o
obj-$(CONFIG_SOC_AM33XX) += omap_hwmod_33xx_data.o obj-$(CONFIG_SOC_AM33XX) += omap_hwmod_33xx_data.o
obj-$(CONFIG_ARCH_OMAP4) += omap_hwmod_44xx_data.o obj-$(CONFIG_ARCH_OMAP4) += omap_hwmod_44xx_data.o
obj-$(CONFIG_SOC_OMAP5) += omap_hwmod_54xx_data.o obj-$(CONFIG_SOC_OMAP5) += omap_hwmod_54xx_data.o
obj-$(CONFIG_SOC_DRA7XX) += omap_hwmod_7xx_data.o
# EMU peripherals # EMU peripherals
obj-$(CONFIG_OMAP3_EMU) += emu.o obj-$(CONFIG_OMAP3_EMU) += emu.o
......
...@@ -238,5 +238,6 @@ DT_MACHINE_START(DRA7XX_DT, "Generic DRA7XX (Flattened Device Tree)") ...@@ -238,5 +238,6 @@ DT_MACHINE_START(DRA7XX_DT, "Generic DRA7XX (Flattened Device Tree)")
.init_machine = omap_generic_init, .init_machine = omap_generic_init,
.init_time = omap5_realtime_timer_init, .init_time = omap5_realtime_timer_init,
.dt_compat = dra7xx_boards_compat, .dt_compat = dra7xx_boards_compat,
.restart = omap44xx_restart,
MACHINE_END MACHINE_END
#endif #endif
...@@ -421,6 +421,10 @@ static struct clk aes0_fck; ...@@ -421,6 +421,10 @@ static struct clk aes0_fck;
DEFINE_STRUCT_CLK_HW_OMAP(aes0_fck, NULL); DEFINE_STRUCT_CLK_HW_OMAP(aes0_fck, NULL);
DEFINE_STRUCT_CLK(aes0_fck, dpll_core_ck_parents, clk_ops_null); DEFINE_STRUCT_CLK(aes0_fck, dpll_core_ck_parents, clk_ops_null);
static struct clk rng_fck;
DEFINE_STRUCT_CLK_HW_OMAP(rng_fck, NULL);
DEFINE_STRUCT_CLK(rng_fck, dpll_core_ck_parents, clk_ops_null);
/* /*
* Modules clock nodes * Modules clock nodes
* *
...@@ -966,6 +970,7 @@ static struct omap_clk am33xx_clks[] = { ...@@ -966,6 +970,7 @@ static struct omap_clk am33xx_clks[] = {
CLK(NULL, "smartreflex1_fck", &smartreflex1_fck), CLK(NULL, "smartreflex1_fck", &smartreflex1_fck),
CLK(NULL, "sha0_fck", &sha0_fck), CLK(NULL, "sha0_fck", &sha0_fck),
CLK(NULL, "aes0_fck", &aes0_fck), CLK(NULL, "aes0_fck", &aes0_fck),
CLK(NULL, "rng_fck", &rng_fck),
CLK(NULL, "timer1_fck", &timer1_fck), CLK(NULL, "timer1_fck", &timer1_fck),
CLK(NULL, "timer2_fck", &timer2_fck), CLK(NULL, "timer2_fck", &timer2_fck),
CLK(NULL, "timer3_fck", &timer3_fck), CLK(NULL, "timer3_fck", &timer3_fck),
......
...@@ -1706,6 +1706,18 @@ int __init omap4xxx_clk_init(void) ...@@ -1706,6 +1706,18 @@ int __init omap4xxx_clk_init(void)
omap2_clk_disable_autoidle_all(); omap2_clk_disable_autoidle_all();
/*
* A set rate of ABE DPLL inturn triggers a set rate of USB DPLL
* when its in bypass. So always lock USB before ABE DPLL.
*/
/*
* Lock USB DPLL on OMAP4 devices so that the L3INIT power
* domain can transition to retention state when not in use.
*/
rc = clk_set_rate(&dpll_usb_ck, OMAP4_DPLL_USB_DEFFREQ);
if (rc)
pr_err("%s: failed to configure USB DPLL!\n", __func__);
/* /*
* On OMAP4460 the ABE DPLL fails to turn on if in idle low-power * On OMAP4460 the ABE DPLL fails to turn on if in idle low-power
* state when turning the ABE clock domain. Workaround this by * state when turning the ABE clock domain. Workaround this by
...@@ -1718,13 +1730,5 @@ int __init omap4xxx_clk_init(void) ...@@ -1718,13 +1730,5 @@ int __init omap4xxx_clk_init(void)
if (rc) if (rc)
pr_err("%s: failed to configure ABE DPLL!\n", __func__); pr_err("%s: failed to configure ABE DPLL!\n", __func__);
/*
* Lock USB DPLL on OMAP4 devices so that the L3INIT power
* domain can transition to retention state when not in use.
*/
rc = clk_set_rate(&dpll_usb_ck, OMAP4_DPLL_USB_DEFFREQ);
if (rc)
pr_err("%s: failed to configure USB DPLL!\n", __func__);
return 0; return 0;
} }
...@@ -217,6 +217,7 @@ extern void __init omap3xxx_clockdomains_init(void); ...@@ -217,6 +217,7 @@ extern void __init omap3xxx_clockdomains_init(void);
extern void __init am33xx_clockdomains_init(void); extern void __init am33xx_clockdomains_init(void);
extern void __init omap44xx_clockdomains_init(void); extern void __init omap44xx_clockdomains_init(void);
extern void __init omap54xx_clockdomains_init(void); extern void __init omap54xx_clockdomains_init(void);
extern void __init dra7xx_clockdomains_init(void);
extern void clkdm_add_autodeps(struct clockdomain *clkdm); extern void clkdm_add_autodeps(struct clockdomain *clkdm);
extern void clkdm_del_autodeps(struct clockdomain *clkdm); extern void clkdm_del_autodeps(struct clockdomain *clkdm);
......
This diff is collapsed.
/*
* DRA7xx Clock Management register bits
*
* Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com
*
* Generated by code originally written by:
* Paul Walmsley (paul@pwsan.com)
* Rajendra Nayak (rnayak@ti.com)
* Benoit Cousson (b-cousson@ti.com)
*
* This file is automatically generated from the OMAP hardware databases.
* We respectfully ask that any modifications to this file be coordinated
* with the public linux-omap@vger.kernel.org mailing list and the
* authors above to ensure that the autogeneration scripts are kept
* up-to-date with the file contents.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#ifndef __ARCH_ARM_MACH_OMAP2_CM_REGBITS_7XX_H
#define __ARCH_ARM_MACH_OMAP2_CM_REGBITS_7XX_H
#define DRA7XX_ATL_STATDEP_SHIFT 30
#define DRA7XX_CAM_STATDEP_SHIFT 9
#define DRA7XX_DSP1_STATDEP_SHIFT 1
#define DRA7XX_DSP2_STATDEP_SHIFT 18
#define DRA7XX_DSS_STATDEP_SHIFT 8
#define DRA7XX_EMIF_STATDEP_SHIFT 4
#define DRA7XX_EVE1_STATDEP_SHIFT 19
#define DRA7XX_EVE2_STATDEP_SHIFT 20
#define DRA7XX_EVE3_STATDEP_SHIFT 21
#define DRA7XX_EVE4_STATDEP_SHIFT 22
#define DRA7XX_GMAC_STATDEP_SHIFT 25
#define DRA7XX_GPU_STATDEP_SHIFT 10
#define DRA7XX_IPU1_STATDEP_SHIFT 23
#define DRA7XX_IPU2_STATDEP_SHIFT 0
#define DRA7XX_IPU_STATDEP_SHIFT 24
#define DRA7XX_IVA_STATDEP_SHIFT 2
#define DRA7XX_L3INIT_STATDEP_SHIFT 7
#define DRA7XX_L3MAIN1_STATDEP_SHIFT 5
#define DRA7XX_L4CFG_STATDEP_SHIFT 12
#define DRA7XX_L4PER2_STATDEP_SHIFT 26
#define DRA7XX_L4PER3_STATDEP_SHIFT 27
#define DRA7XX_L4PER_STATDEP_SHIFT 13
#define DRA7XX_L4SEC_STATDEP_SHIFT 14
#define DRA7XX_PCIE_STATDEP_SHIFT 29
#define DRA7XX_VPE_STATDEP_SHIFT 28
#define DRA7XX_WKUPAON_STATDEP_SHIFT 15
#endif
This diff is collapsed.
This diff is collapsed.
...@@ -665,6 +665,11 @@ void __init dra7xx_init_early(void) ...@@ -665,6 +665,11 @@ void __init dra7xx_init_early(void)
omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE)); omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE));
omap_prm_base_init(); omap_prm_base_init();
omap_cm_base_init(); omap_cm_base_init();
omap44xx_prm_init();
dra7xx_powerdomains_init();
dra7xx_clockdomains_init();
dra7xx_hwmod_init();
omap_hwmod_init_postsetup();
} }
#endif #endif
......
...@@ -1405,7 +1405,9 @@ static void _enable_sysc(struct omap_hwmod *oh) ...@@ -1405,7 +1405,9 @@ static void _enable_sysc(struct omap_hwmod *oh)
(sf & SYSC_HAS_CLOCKACTIVITY)) (sf & SYSC_HAS_CLOCKACTIVITY))
_set_clockactivity(oh, oh->class->sysc->clockact, &v); _set_clockactivity(oh, oh->class->sysc->clockact, &v);
_write_sysconfig(v, oh); /* If the cached value is the same as the new value, skip the write */
if (oh->_sysc_cache != v)
_write_sysconfig(v, oh);
/* /*
* Set the autoidle bit only after setting the smartidle bit * Set the autoidle bit only after setting the smartidle bit
......
...@@ -751,6 +751,7 @@ extern int omap3xxx_hwmod_init(void); ...@@ -751,6 +751,7 @@ extern int omap3xxx_hwmod_init(void);
extern int omap44xx_hwmod_init(void); extern int omap44xx_hwmod_init(void);
extern int omap54xx_hwmod_init(void); extern int omap54xx_hwmod_init(void);
extern int am33xx_hwmod_init(void); extern int am33xx_hwmod_init(void);
extern int dra7xx_hwmod_init(void);
extern int __init omap_hwmod_register_links(struct omap_hwmod_ocp_if **ois); extern int __init omap_hwmod_register_links(struct omap_hwmod_ocp_if **ois);
......
...@@ -325,7 +325,6 @@ static struct omap_hwmod am33xx_adc_tsc_hwmod = { ...@@ -325,7 +325,6 @@ static struct omap_hwmod am33xx_adc_tsc_hwmod = {
* *
* - cEFUSE (doesn't fall under any ocp_if) * - cEFUSE (doesn't fall under any ocp_if)
* - clkdiv32k * - clkdiv32k
* - debugss
* - ocp watch point * - ocp watch point
*/ */
#if 0 #if 0
...@@ -369,27 +368,6 @@ static struct omap_hwmod am33xx_clkdiv32k_hwmod = { ...@@ -369,27 +368,6 @@ static struct omap_hwmod am33xx_clkdiv32k_hwmod = {
}, },
}; };
/*
* 'debugss' class
* debug sub system
*/
static struct omap_hwmod_class am33xx_debugss_hwmod_class = {
.name = "debugss",
};
static struct omap_hwmod am33xx_debugss_hwmod = {
.name = "debugss",
.class = &am33xx_debugss_hwmod_class,
.clkdm_name = "l3_aon_clkdm",
.main_clk = "debugss_ick",
.prcm = {
.omap4 = {
.clkctrl_offs = AM33XX_CM_WKUP_DEBUGSS_CLKCTRL_OFFSET,
.modulemode = MODULEMODE_SWCTRL,
},
},
};
/* ocpwp */ /* ocpwp */
static struct omap_hwmod_class am33xx_ocpwp_hwmod_class = { static struct omap_hwmod_class am33xx_ocpwp_hwmod_class = {
.name = "ocpwp", .name = "ocpwp",
...@@ -482,6 +460,34 @@ static struct omap_hwmod am33xx_ocmcram_hwmod = { ...@@ -482,6 +460,34 @@ static struct omap_hwmod am33xx_ocmcram_hwmod = {
}, },
}; };
/*
* 'debugss' class
* debug sub system
*/
static struct omap_hwmod_opt_clk debugss_opt_clks[] = {
{ .role = "dbg_sysclk", .clk = "dbg_sysclk_ck" },
{ .role = "dbg_clka", .clk = "dbg_clka_ck" },
};
static struct omap_hwmod_class am33xx_debugss_hwmod_class = {
.name = "debugss",
};
static struct omap_hwmod am33xx_debugss_hwmod = {
.name = "debugss",
.class = &am33xx_debugss_hwmod_class,
.clkdm_name = "l3_aon_clkdm",
.main_clk = "trace_clk_div_ck",
.prcm = {
.omap4 = {
.clkctrl_offs = AM33XX_CM_WKUP_DEBUGSS_CLKCTRL_OFFSET,
.modulemode = MODULEMODE_SWCTRL,
},
},
.opt_clks = debugss_opt_clks,
.opt_clks_cnt = ARRAY_SIZE(debugss_opt_clks),
};
/* 'smartreflex' class */ /* 'smartreflex' class */
static struct omap_hwmod_class am33xx_smartreflex_hwmod_class = { static struct omap_hwmod_class am33xx_smartreflex_hwmod_class = {
.name = "smartreflex", .name = "smartreflex",
...@@ -1796,6 +1802,24 @@ static struct omap_hwmod_ocp_if am33xx_l3_main__gfx = { ...@@ -1796,6 +1802,24 @@ static struct omap_hwmod_ocp_if am33xx_l3_main__gfx = {
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
/* l3_main -> debugss */
static struct omap_hwmod_addr_space am33xx_debugss_addrs[] = {
{
.pa_start = 0x4b000000,
.pa_end = 0x4b000000 + SZ_16M - 1,
.flags = ADDR_TYPE_RT
},
{ }
};
static struct omap_hwmod_ocp_if am33xx_l3_main__debugss = {
.master = &am33xx_l3_main_hwmod,
.slave = &am33xx_debugss_hwmod,
.clk = "dpll_core_m4_ck",
.addr = am33xx_debugss_addrs,
.user = OCP_USER_MPU,
};
/* l4 wkup -> smartreflex0 */ /* l4 wkup -> smartreflex0 */
static struct omap_hwmod_ocp_if am33xx_l4_wkup__smartreflex0 = { static struct omap_hwmod_ocp_if am33xx_l4_wkup__smartreflex0 = {
.master = &am33xx_l4_wkup_hwmod, .master = &am33xx_l4_wkup_hwmod,
...@@ -2470,6 +2494,7 @@ static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = { ...@@ -2470,6 +2494,7 @@ static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = {
&am33xx_pruss__l3_main, &am33xx_pruss__l3_main,
&am33xx_wkup_m3__l4_wkup, &am33xx_wkup_m3__l4_wkup,
&am33xx_gfx__l3_main, &am33xx_gfx__l3_main,
&am33xx_l3_main__debugss,
&am33xx_l4_wkup__wkup_m3, &am33xx_l4_wkup__wkup_m3,
&am33xx_l4_wkup__control, &am33xx_l4_wkup__control,
&am33xx_l4_wkup__smartreflex0, &am33xx_l4_wkup__smartreflex0,
......
...@@ -739,6 +739,39 @@ static struct omap_hwmod omap54xx_kbd_hwmod = { ...@@ -739,6 +739,39 @@ static struct omap_hwmod omap54xx_kbd_hwmod = {
}, },
}; };
/*
* 'mailbox' class
* mailbox module allowing communication between the on-chip processors using a
* queued mailbox-interrupt mechanism.
*/
static struct omap_hwmod_class_sysconfig omap54xx_mailbox_sysc = {
.rev_offs = 0x0000,
.sysc_offs = 0x0010,
.sysc_flags = (SYSC_HAS_RESET_STATUS | SYSC_HAS_SIDLEMODE |
SYSC_HAS_SOFTRESET),
.idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
.sysc_fields = &omap_hwmod_sysc_type2,
};
static struct omap_hwmod_class omap54xx_mailbox_hwmod_class = {
.name = "mailbox",
.sysc = &omap54xx_mailbox_sysc,
};
/* mailbox */
static struct omap_hwmod omap54xx_mailbox_hwmod = {
.name = "mailbox",
.class = &omap54xx_mailbox_hwmod_class,
.clkdm_name = "l4cfg_clkdm",
.prcm = {
.omap4 = {
.clkctrl_offs = OMAP54XX_CM_L4CFG_MAILBOX_CLKCTRL_OFFSET,
.context_offs = OMAP54XX_RM_L4CFG_MAILBOX_CONTEXT_OFFSET,
},
},
};
/* /*
* 'mcbsp' class * 'mcbsp' class
* multi channel buffered serial port controller * multi channel buffered serial port controller
...@@ -1807,6 +1840,14 @@ static struct omap_hwmod_ocp_if omap54xx_l4_wkup__kbd = { ...@@ -1807,6 +1840,14 @@ static struct omap_hwmod_ocp_if omap54xx_l4_wkup__kbd = {
.user = OCP_USER_MPU | OCP_USER_SDMA, .user = OCP_USER_MPU | OCP_USER_SDMA,
}; };
/* l4_cfg -> mailbox */
static struct omap_hwmod_ocp_if omap54xx_l4_cfg__mailbox = {
.master = &omap54xx_l4_cfg_hwmod,
.slave = &omap54xx_mailbox_hwmod,
.clk = "l4_root_clk_div",
.user = OCP_USER_MPU | OCP_USER_SDMA,
};
/* l4_abe -> mcbsp1 */ /* l4_abe -> mcbsp1 */
static struct omap_hwmod_ocp_if omap54xx_l4_abe__mcbsp1 = { static struct omap_hwmod_ocp_if omap54xx_l4_abe__mcbsp1 = {
.master = &omap54xx_l4_abe_hwmod, .master = &omap54xx_l4_abe_hwmod,
...@@ -2107,6 +2148,7 @@ static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = { ...@@ -2107,6 +2148,7 @@ static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = {
&omap54xx_l4_per__i2c4, &omap54xx_l4_per__i2c4,
&omap54xx_l4_per__i2c5, &omap54xx_l4_per__i2c5,
&omap54xx_l4_wkup__kbd, &omap54xx_l4_wkup__kbd,
&omap54xx_l4_cfg__mailbox,
&omap54xx_l4_abe__mcbsp1, &omap54xx_l4_abe__mcbsp1,
&omap54xx_l4_abe__mcbsp2, &omap54xx_l4_abe__mcbsp2,
&omap54xx_l4_abe__mcbsp3, &omap54xx_l4_abe__mcbsp3,
......
This diff is collapsed.
...@@ -256,6 +256,7 @@ extern void omap3xxx_powerdomains_init(void); ...@@ -256,6 +256,7 @@ extern void omap3xxx_powerdomains_init(void);
extern void am33xx_powerdomains_init(void); extern void am33xx_powerdomains_init(void);
extern void omap44xx_powerdomains_init(void); extern void omap44xx_powerdomains_init(void);
extern void omap54xx_powerdomains_init(void); extern void omap54xx_powerdomains_init(void);
extern void dra7xx_powerdomains_init(void);
extern struct pwrdm_ops omap2_pwrdm_operations; extern struct pwrdm_ops omap2_pwrdm_operations;
extern struct pwrdm_ops omap3_pwrdm_operations; extern struct pwrdm_ops omap3_pwrdm_operations;
......
...@@ -336,6 +336,13 @@ static struct powerdomain dpll5_pwrdm = { ...@@ -336,6 +336,13 @@ static struct powerdomain dpll5_pwrdm = {
.voltdm = { .name = "core" }, .voltdm = { .name = "core" },
}; };
static struct powerdomain alwon_81xx_pwrdm = {
.name = "alwon_pwrdm",
.prcm_offs = TI81XX_PRM_ALWON_MOD,
.pwrsts = PWRSTS_OFF_ON,
.voltdm = { .name = "core" },
};
static struct powerdomain device_81xx_pwrdm = { static struct powerdomain device_81xx_pwrdm = {
.name = "device_pwrdm", .name = "device_pwrdm",
.prcm_offs = TI81XX_PRM_DEVICE_MOD, .prcm_offs = TI81XX_PRM_DEVICE_MOD,
...@@ -442,6 +449,7 @@ static struct powerdomain *powerdomains_am35x[] __initdata = { ...@@ -442,6 +449,7 @@ static struct powerdomain *powerdomains_am35x[] __initdata = {
}; };
static struct powerdomain *powerdomains_ti81xx[] __initdata = { static struct powerdomain *powerdomains_ti81xx[] __initdata = {
&alwon_81xx_pwrdm,
&device_81xx_pwrdm, &device_81xx_pwrdm,
&active_816x_pwrdm, &active_816x_pwrdm,
&default_816x_pwrdm, &default_816x_pwrdm,
......
This diff is collapsed.
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
#define TI816X_PRM_IVAHD1_MOD 0x0d00 #define TI816X_PRM_IVAHD1_MOD 0x0d00
#define TI816X_PRM_IVAHD2_MOD 0x0e00 #define TI816X_PRM_IVAHD2_MOD 0x0e00
#define TI816X_PRM_SGX_MOD 0x0f00 #define TI816X_PRM_SGX_MOD 0x0f00
#define TI81XX_PRM_ALWON_MOD 0x1800
/* 24XX register bits shared between CM & PRM registers */ /* 24XX register bits shared between CM & PRM registers */
......
...@@ -38,6 +38,11 @@ ...@@ -38,6 +38,11 @@
#define OMAP54XX_SCRM_PARTITION 4 #define OMAP54XX_SCRM_PARTITION 4
#define OMAP54XX_PRCM_MPU_PARTITION 5 #define OMAP54XX_PRCM_MPU_PARTITION 5
#define DRA7XX_PRM_PARTITION 1
#define DRA7XX_CM_CORE_AON_PARTITION 2
#define DRA7XX_CM_CORE_PARTITION 3
#define DRA7XX_MPU_PRCM_PARTITION 5
/* /*
* OMAP4_MAX_PRCM_PARTITIONS: set to the highest value of the PRCM partition * OMAP4_MAX_PRCM_PARTITIONS: set to the highest value of the PRCM partition
* IDs, plus one * IDs, plus one
......
/*
* DRA7xx PRCM MPU instance offset macros
*
* Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com
*
* Generated by code originally written by:
* Paul Walmsley (paul@pwsan.com)
* Rajendra Nayak (rnayak@ti.com)
* Benoit Cousson (b-cousson@ti.com)
*
* This file is automatically generated from the OMAP hardware databases.
* We respectfully ask that any modifications to this file be coordinated
* with the public linux-omap@vger.kernel.org mailing list and the
* authors above to ensure that the autogeneration scripts are kept
* up-to-date with the file contents.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#ifndef __ARCH_ARM_MACH_OMAP2_PRCM_MPU7XX_H
#define __ARCH_ARM_MACH_OMAP2_PRCM_MPU7XX_H
#include "prcm_mpu_44xx_54xx.h"
#define DRA7XX_PRCM_MPU_BASE 0x48243000
#define DRA7XX_PRCM_MPU_REGADDR(inst, reg) \
OMAP2_L4_IO_ADDRESS(DRA7XX_PRCM_MPU_BASE + (inst) + (reg))
/* MPU_PRCM instances */
#define DRA7XX_MPU_PRCM_OCP_SOCKET_INST 0x0000
#define DRA7XX_MPU_PRCM_DEVICE_INST 0x0200
#define DRA7XX_MPU_PRCM_PRM_C0_INST 0x0400
#define DRA7XX_MPU_PRCM_CM_C0_INST 0x0600
#define DRA7XX_MPU_PRCM_PRM_C1_INST 0x0800
#define DRA7XX_MPU_PRCM_CM_C1_INST 0x0a00
/* PRCM_MPU clockdomain register offsets (from instance start) */
#define DRA7XX_MPU_PRCM_CM_C0_CPU0_CDOFFS 0x0000
#define DRA7XX_MPU_PRCM_CM_C1_CPU1_CDOFFS 0x0000
/* MPU_PRCM */
/* MPU_PRCM.PRCM_MPU_OCP_SOCKET register offsets */
#define DRA7XX_REVISION_PRCM_MPU_OFFSET 0x0000
/* MPU_PRCM.PRCM_MPU_DEVICE register offsets */
#define DRA7XX_PRM_FRAC_INCREMENTER_NUMERATOR_OFFSET 0x0010
#define DRA7XX_PRM_FRAC_INCREMENTER_DENUMERATOR_RELOAD_OFFSET 0x0014
/* MPU_PRCM.PRCM_MPU_PRM_C0 register offsets */
#define DRA7XX_PM_CPU0_PWRSTCTRL_OFFSET 0x0000
#define DRA7XX_PM_CPU0_PWRSTST_OFFSET 0x0004
#define DRA7XX_RM_CPU0_CPU0_RSTCTRL_OFFSET 0x0010
#define DRA7XX_RM_CPU0_CPU0_RSTST_OFFSET 0x0014
#define DRA7XX_RM_CPU0_CPU0_CONTEXT_OFFSET 0x0024
/* MPU_PRCM.PRCM_MPU_CM_C0 register offsets */
#define DRA7XX_CM_CPU0_CLKSTCTRL_OFFSET 0x0000
#define DRA7XX_CM_CPU0_CPU0_CLKCTRL_OFFSET 0x0020
#define DRA7XX_CM_CPU0_CPU0_CLKCTRL DRA7XX_MPU_PRCM_REGADDR(DRA7XX_MPU_PRCM_CM_C0_INST, 0x0020)
/* MPU_PRCM.PRCM_MPU_PRM_C1 register offsets */
#define DRA7XX_PM_CPU1_PWRSTCTRL_OFFSET 0x0000
#define DRA7XX_PM_CPU1_PWRSTST_OFFSET 0x0004
#define DRA7XX_RM_CPU1_CPU1_RSTCTRL_OFFSET 0x0010
#define DRA7XX_RM_CPU1_CPU1_RSTST_OFFSET 0x0014
#define DRA7XX_RM_CPU1_CPU1_CONTEXT_OFFSET 0x0024
/* MPU_PRCM.PRCM_MPU_CM_C1 register offsets */
#define DRA7XX_CM_CPU1_CLKSTCTRL_OFFSET 0x0000
#define DRA7XX_CM_CPU1_CPU1_CLKCTRL_OFFSET 0x0020
#define DRA7XX_CM_CPU1_CPU1_CLKCTRL DRA7XX_MPU_PRCM_REGADDR(DRA7XX_MPU_PRCM_CM_C1_INST, 0x0020)
#endif
...@@ -620,6 +620,15 @@ static int omap4_pwrdm_wait_transition(struct powerdomain *pwrdm) ...@@ -620,6 +620,15 @@ static int omap4_pwrdm_wait_transition(struct powerdomain *pwrdm)
return 0; return 0;
} }
static int omap4_check_vcvp(void)
{
/* No VC/VP on dra7xx devices */
if (soc_is_dra7xx())
return 0;
return 1;
}
struct pwrdm_ops omap4_pwrdm_operations = { struct pwrdm_ops omap4_pwrdm_operations = {
.pwrdm_set_next_pwrst = omap4_pwrdm_set_next_pwrst, .pwrdm_set_next_pwrst = omap4_pwrdm_set_next_pwrst,
.pwrdm_read_next_pwrst = omap4_pwrdm_read_next_pwrst, .pwrdm_read_next_pwrst = omap4_pwrdm_read_next_pwrst,
...@@ -637,6 +646,7 @@ struct pwrdm_ops omap4_pwrdm_operations = { ...@@ -637,6 +646,7 @@ struct pwrdm_ops omap4_pwrdm_operations = {
.pwrdm_set_mem_onst = omap4_pwrdm_set_mem_onst, .pwrdm_set_mem_onst = omap4_pwrdm_set_mem_onst,
.pwrdm_set_mem_retst = omap4_pwrdm_set_mem_retst, .pwrdm_set_mem_retst = omap4_pwrdm_set_mem_retst,
.pwrdm_wait_transition = omap4_pwrdm_wait_transition, .pwrdm_wait_transition = omap4_pwrdm_wait_transition,
.pwrdm_has_voltdm = omap4_check_vcvp,
}; };
/* /*
...@@ -650,7 +660,7 @@ static struct prm_ll_data omap44xx_prm_ll_data = { ...@@ -650,7 +660,7 @@ static struct prm_ll_data omap44xx_prm_ll_data = {
int __init omap44xx_prm_init(void) int __init omap44xx_prm_init(void)
{ {
if (!cpu_is_omap44xx() && !soc_is_omap54xx()) if (!cpu_is_omap44xx() && !soc_is_omap54xx() && !soc_is_dra7xx())
return 0; return 0;
return prm_register(&omap44xx_prm_ll_data); return prm_register(&omap44xx_prm_ll_data);
......
This diff is collapsed.
...@@ -20,10 +20,13 @@ ...@@ -20,10 +20,13 @@
#include "common.h" #include "common.h"
#include "prcm-common.h" #include "prcm-common.h"
#include "prm44xx.h" #include "prm44xx.h"
#include "prm54xx.h"
#include "prm7xx.h"
#include "prminst44xx.h" #include "prminst44xx.h"
#include "prm-regbits-44xx.h" #include "prm-regbits-44xx.h"
#include "prcm44xx.h" #include "prcm44xx.h"
#include "prcm_mpu44xx.h" #include "prcm_mpu44xx.h"
#include "soc.h"
static void __iomem *_prm_bases[OMAP4_MAX_PRCM_PARTITIONS]; static void __iomem *_prm_bases[OMAP4_MAX_PRCM_PARTITIONS];
...@@ -165,10 +168,19 @@ int omap4_prminst_deassert_hardreset(u8 shift, u8 part, s16 inst, ...@@ -165,10 +168,19 @@ int omap4_prminst_deassert_hardreset(u8 shift, u8 part, s16 inst,
void omap4_prminst_global_warm_sw_reset(void) void omap4_prminst_global_warm_sw_reset(void)
{ {
u32 v; u32 v;
s16 dev_inst;
v = omap4_prminst_read_inst_reg(OMAP4430_PRM_PARTITION,
OMAP4430_PRM_DEVICE_INST, if (cpu_is_omap44xx())
OMAP4_PRM_RSTCTRL_OFFSET); dev_inst = OMAP4430_PRM_DEVICE_INST;
else if (soc_is_omap54xx())
dev_inst = OMAP54XX_PRM_DEVICE_INST;
else if (soc_is_dra7xx())
dev_inst = DRA7XX_PRM_DEVICE_INST;
else
return;
v = omap4_prminst_read_inst_reg(OMAP4430_PRM_PARTITION, dev_inst,
OMAP4_PRM_RSTCTRL_OFFSET);
v |= OMAP4430_RST_GLOBAL_WARM_SW_MASK; v |= OMAP4430_RST_GLOBAL_WARM_SW_MASK;
omap4_prminst_write_inst_reg(v, OMAP4430_PRM_PARTITION, omap4_prminst_write_inst_reg(v, OMAP4430_PRM_PARTITION,
OMAP4430_PRM_DEVICE_INST, OMAP4430_PRM_DEVICE_INST,
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include "ste-dma40-db8500.h" #include "ste-dma40-db8500.h"
#include "board-mop500.h" #include "board-mop500.h"
#include "devices-db8500.h" #include "devices-db8500.h"
#include "pins-db8500.h"
static struct stedma40_chan_cfg msp0_dma_rx = { static struct stedma40_chan_cfg msp0_dma_rx = {
.high_priority = true, .high_priority = true,
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include "pins-db8500.h"
#include "board-mop500.h" #include "board-mop500.h"
enum custom_pin_cfg_t { enum custom_pin_cfg_t {
......
...@@ -324,21 +324,19 @@ static struct lp55xx_platform_data __initdata lp5521_sec_data = { ...@@ -324,21 +324,19 @@ static struct lp55xx_platform_data __initdata lp5521_sec_data = {
.clock_mode = LP55XX_CLOCK_EXT, .clock_mode = LP55XX_CLOCK_EXT,
}; };
/* I2C0 devices only available on the first HREF/MOP500 */
static struct i2c_board_info __initdata mop500_i2c0_devices[] = { static struct i2c_board_info __initdata mop500_i2c0_devices[] = {
{ {
I2C_BOARD_INFO("tc3589x", 0x42), I2C_BOARD_INFO("tc3589x", 0x42),
.irq = NOMADIK_GPIO_TO_IRQ(217), .irq = NOMADIK_GPIO_TO_IRQ(217),
.platform_data = &mop500_tc35892_data, .platform_data = &mop500_tc35892_data,
}, },
/* I2C0 devices only available prior to HREFv60 */
{ {
I2C_BOARD_INFO("tps61052", 0x33), I2C_BOARD_INFO("tps61052", 0x33),
.platform_data = &mop500_tps61052_data, .platform_data = &mop500_tps61052_data,
}, },
}; };
#define NUM_PRE_V60_I2C0_DEVICES 1
static struct i2c_board_info __initdata mop500_i2c2_devices[] = { static struct i2c_board_info __initdata mop500_i2c2_devices[] = {
{ {
/* lp5521 LED driver, 1st device */ /* lp5521 LED driver, 1st device */
...@@ -356,6 +354,17 @@ static struct i2c_board_info __initdata mop500_i2c2_devices[] = { ...@@ -356,6 +354,17 @@ static struct i2c_board_info __initdata mop500_i2c2_devices[] = {
}, },
}; };
static int __init mop500_i2c_board_init(void)
{
if (machine_is_u8500())
mop500_uib_i2c_add(0, mop500_i2c0_devices,
ARRAY_SIZE(mop500_i2c0_devices));
mop500_uib_i2c_add(2, mop500_i2c2_devices,
ARRAY_SIZE(mop500_i2c2_devices));
return 0;
}
device_initcall(mop500_i2c_board_init);
static void __init mop500_i2c_init(struct device *parent) static void __init mop500_i2c_init(struct device *parent)
{ {
db8500_add_i2c0(parent, NULL); db8500_add_i2c0(parent, NULL);
...@@ -564,7 +573,6 @@ static struct platform_device *snowball_platform_devs[] __initdata = { ...@@ -564,7 +573,6 @@ static struct platform_device *snowball_platform_devs[] __initdata = {
static void __init mop500_init_machine(void) static void __init mop500_init_machine(void)
{ {
struct device *parent = NULL; struct device *parent = NULL;
int i2c0_devs;
int i; int i;
platform_device_register(&db8500_prcmu_device); platform_device_register(&db8500_prcmu_device);
...@@ -587,19 +595,13 @@ static void __init mop500_init_machine(void) ...@@ -587,19 +595,13 @@ static void __init mop500_init_machine(void)
mop500_spi_init(parent); mop500_spi_init(parent);
mop500_audio_init(parent); mop500_audio_init(parent);
mop500_uart_init(parent); mop500_uart_init(parent);
u8500_cryp1_hash1_init(parent); u8500_cryp1_hash1_init(parent);
i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices);
i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs);
i2c_register_board_info(2, mop500_i2c2_devices,
ARRAY_SIZE(mop500_i2c2_devices));
/* This board has full regulator constraints */ /* This board has full regulator constraints */
regulator_has_full_constraints(); regulator_has_full_constraints();
} }
static void __init snowball_init_machine(void) static void __init snowball_init_machine(void)
{ {
struct device *parent = NULL; struct device *parent = NULL;
...@@ -634,7 +636,6 @@ static void __init snowball_init_machine(void) ...@@ -634,7 +636,6 @@ static void __init snowball_init_machine(void)
static void __init hrefv60_init_machine(void) static void __init hrefv60_init_machine(void)
{ {
struct device *parent = NULL; struct device *parent = NULL;
int i2c0_devs;
int i; int i;
platform_device_register(&db8500_prcmu_device); platform_device_register(&db8500_prcmu_device);
...@@ -663,14 +664,6 @@ static void __init hrefv60_init_machine(void) ...@@ -663,14 +664,6 @@ static void __init hrefv60_init_machine(void)
mop500_audio_init(parent); mop500_audio_init(parent);
mop500_uart_init(parent); mop500_uart_init(parent);
i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices);
i2c0_devs -= NUM_PRE_V60_I2C0_DEVICES;
i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs);
i2c_register_board_info(2, mop500_i2c2_devices,
ARRAY_SIZE(mop500_i2c2_devices));
/* This board has full regulator constraints */ /* This board has full regulator constraints */
regulator_has_full_constraints(); regulator_has_full_constraints();
} }
......
...@@ -156,7 +156,8 @@ static void __init db8500_add_gpios(struct device *parent) ...@@ -156,7 +156,8 @@ static void __init db8500_add_gpios(struct device *parent)
.supports_sleepmode = true, .supports_sleepmode = true,
}; };
dbx500_add_gpios(parent, ARRAY_AND_SIZE(db8500_gpio_base), dbx500_add_gpios(parent, db8500_gpio_base,
ARRAY_SIZE(db8500_gpio_base),
IRQ_DB8500_GPIO0, &pdata); IRQ_DB8500_GPIO0, &pdata);
dbx500_add_pinctrl(parent, "pinctrl-db8500", U8500_PRCMU_BASE); dbx500_add_pinctrl(parent, "pinctrl-db8500", U8500_PRCMU_BASE);
} }
......
This diff is collapsed.
...@@ -208,7 +208,7 @@ static void __init arm_bootmem_init(unsigned long start_pfn, ...@@ -208,7 +208,7 @@ static void __init arm_bootmem_init(unsigned long start_pfn,
#ifdef CONFIG_ZONE_DMA #ifdef CONFIG_ZONE_DMA
unsigned long arm_dma_zone_size __read_mostly; phys_addr_t arm_dma_zone_size __read_mostly;
EXPORT_SYMBOL(arm_dma_zone_size); EXPORT_SYMBOL(arm_dma_zone_size);
/* /*
......
...@@ -133,6 +133,8 @@ struct pl08x_bus_data { ...@@ -133,6 +133,8 @@ struct pl08x_bus_data {
u8 buswidth; u8 buswidth;
}; };
#define IS_BUS_ALIGNED(bus) IS_ALIGNED((bus)->addr, (bus)->buswidth)
/** /**
* struct pl08x_phy_chan - holder for the physical channels * struct pl08x_phy_chan - holder for the physical channels
* @id: physical index to this channel * @id: physical index to this channel
...@@ -845,10 +847,13 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x, ...@@ -845,10 +847,13 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
pl08x_choose_master_bus(&bd, &mbus, &sbus, cctl); pl08x_choose_master_bus(&bd, &mbus, &sbus, cctl);
dev_vdbg(&pl08x->adev->dev, "src=0x%08x%s/%u dst=0x%08x%s/%u len=%zu\n", dev_vdbg(&pl08x->adev->dev,
bd.srcbus.addr, cctl & PL080_CONTROL_SRC_INCR ? "+" : "", "src=0x%08llx%s/%u dst=0x%08llx%s/%u len=%zu\n",
(u64)bd.srcbus.addr,
cctl & PL080_CONTROL_SRC_INCR ? "+" : "",
bd.srcbus.buswidth, bd.srcbus.buswidth,
bd.dstbus.addr, cctl & PL080_CONTROL_DST_INCR ? "+" : "", (u64)bd.dstbus.addr,
cctl & PL080_CONTROL_DST_INCR ? "+" : "",
bd.dstbus.buswidth, bd.dstbus.buswidth,
bd.remainder); bd.remainder);
dev_vdbg(&pl08x->adev->dev, "mbus=%s sbus=%s\n", dev_vdbg(&pl08x->adev->dev, "mbus=%s sbus=%s\n",
...@@ -886,8 +891,8 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x, ...@@ -886,8 +891,8 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
return 0; return 0;
} }
if ((bd.srcbus.addr % bd.srcbus.buswidth) || if (!IS_BUS_ALIGNED(&bd.srcbus) ||
(bd.dstbus.addr % bd.dstbus.buswidth)) { !IS_BUS_ALIGNED(&bd.dstbus)) {
dev_err(&pl08x->adev->dev, dev_err(&pl08x->adev->dev,
"%s src & dst address must be aligned to src" "%s src & dst address must be aligned to src"
" & dst width if peripheral is flow controller", " & dst width if peripheral is flow controller",
...@@ -908,9 +913,9 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x, ...@@ -908,9 +913,9 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
*/ */
if (bd.remainder < mbus->buswidth) if (bd.remainder < mbus->buswidth)
early_bytes = bd.remainder; early_bytes = bd.remainder;
else if ((mbus->addr) % (mbus->buswidth)) { else if (!IS_BUS_ALIGNED(mbus)) {
early_bytes = mbus->buswidth - (mbus->addr) % early_bytes = mbus->buswidth -
(mbus->buswidth); (mbus->addr & (mbus->buswidth - 1));
if ((bd.remainder - early_bytes) < mbus->buswidth) if ((bd.remainder - early_bytes) < mbus->buswidth)
early_bytes = bd.remainder; early_bytes = bd.remainder;
} }
...@@ -928,7 +933,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x, ...@@ -928,7 +933,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
* Master now aligned * Master now aligned
* - if slave is not then we must set its width down * - if slave is not then we must set its width down
*/ */
if (sbus->addr % sbus->buswidth) { if (!IS_BUS_ALIGNED(sbus)) {
dev_dbg(&pl08x->adev->dev, dev_dbg(&pl08x->adev->dev,
"%s set down bus width to one byte\n", "%s set down bus width to one byte\n",
__func__); __func__);
......
...@@ -2,6 +2,7 @@ obj-$(CONFIG_IRQCHIP) += irqchip.o ...@@ -2,6 +2,7 @@ obj-$(CONFIG_IRQCHIP) += irqchip.o
obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o
obj-$(CONFIG_ARCH_EXYNOS) += exynos-combiner.o obj-$(CONFIG_ARCH_EXYNOS) += exynos-combiner.o
obj-$(CONFIG_ARCH_MMP) += irq-mmp.o
obj-$(CONFIG_ARCH_MVEBU) += irq-armada-370-xp.o obj-$(CONFIG_ARCH_MVEBU) += irq-armada-370-xp.o
obj-$(CONFIG_ARCH_MXS) += irq-mxs.o obj-$(CONFIG_ARCH_MXS) += irq-mxs.o
obj-$(CONFIG_ARCH_S3C24XX) += irq-s3c24xx.o obj-$(CONFIG_ARCH_S3C24XX) += irq-s3c24xx.o
......
#ifndef __IRQCHIP_MMP_H
#define __IRQCHIP_MMP_H
extern struct irq_chip icu_irq_chip;
#endif /* __IRQCHIP_MMP_H */
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