Merge branch 'prima2/multiplatform' into next/multiplatform (063ab6da) · Commits · 戴 / test

arch/arm/Kconfig

+1 −16

Original line number	Diff line number	Diff line
		@@ -49,7 +49,6 @@ config ARM
		select HAVE_REGS_AND_STACK_ACCESS_API
		select HAVE_SYSCALL_TRACEPOINTS
		select HAVE_UID16
		select HAVE_VIRT_TO_BUS
		select KTIME_SCALAR
		select PERF_USE_VMALLOC
		select RTC_LIB
		@@ -404,21 +403,6 @@ config ARCH_GEMINI
		help
		Support for the Cortina Systems Gemini family SoCs

		config ARCH_SIRF
		bool "CSR SiRF"
		select ARCH_REQUIRE_GPIOLIB
		select AUTO_ZRELADDR
		select COMMON_CLK
		select GENERIC_CLOCKEVENTS
		select GENERIC_IRQ_CHIP
		select MIGHT_HAVE_CACHE_L2X0
		select NO_IOPORT
		select PINCTRL
		select PINCTRL_SIRF
		select USE_OF
		help
		Support for CSR SiRFprimaII/Marco/Polo platforms

		config ARCH_EBSA110
		bool "EBSA-110"
		select ARCH_USES_GETTIMEOFFSET
		@@ -1557,6 +1541,7 @@ config HAVE_ARM_ARCH_TIMER
		config HAVE_ARM_TWD
		bool
		depends on SMP
		select CLKSRC_OF if OF
		help
		This options enables support for the ARM timer and watchdog unit

arch/arm/Kconfig.debug

+1 −0

Original line number	Diff line number	Diff line
		@@ -608,6 +608,7 @@ config DEBUG_LL_INCLUDE
		default "debug/nomadik.S" if DEBUG_NOMADIK_UART
		default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
		default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
		default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 \|\| DEBUG_SIRFMARCO_UART1
		default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
		default "debug/sunxi.S" if DEBUG_SUNXI_UART0 \|\| DEBUG_SUNXI_UART1
		default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT \|\| \

arch/arm/boot/dts/atlas6-evb.dts

0 → 100644

+78 −0

Original line number	Diff line number	Diff line
		/*
		* DTS file for CSR SiRFatlas6 Evaluation Board
		*
		* Copyright (c) 2012 Cambridge Silicon Radio Limited, a CSR plc group company.
		*
		* Licensed under GPLv2 or later.
		*/

		/dts-v1/;

		/include/ "atlas6.dtsi"

		/ {
		model = "CSR SiRFatlas6 Evaluation Board";
		compatible = "sirf,atlas6-cb", "sirf,atlas6";

		memory {
		reg = <0x00000000 0x20000000>;
		};

		axi {
		peri-iobg {
		uart@b0060000 {
		pinctrl-names = "default";
		pinctrl-0 = <&uart1_pins_a>;
		};
		spi@b00d0000 {
		status = "okay";
		pinctrl-names = "default";
		pinctrl-0 = <&spi0_pins_a>;
		spi@0 {
		compatible = "spidev";
		reg = <0>;
		spi-max-frequency = <1000000>;
		};
		};
		spi@b0170000 {
		pinctrl-names = "default";
		pinctrl-0 = <&spi1_pins_a>;
		};
		i2c0: i2c@b00e0000 {
		status = "okay";
		pinctrl-names = "default";
		pinctrl-0 = <&i2c0_pins_a>;
		lcd@40 {
		compatible = "sirf,lcd";
		reg = <0x40>;
		};
		};

		};
		disp-iobg {
		lcd@90010000 {
		status = "okay";
		pinctrl-names = "default";
		pinctrl-0 = <&lcd_24pins_a>;
		};
		};
		};
		display: display@0 {
		panels {
		panel0: panel@0 {
		panel-name = "Innolux TFT";
		hactive = <800>;
		vactive = <480>;
		left_margin = <20>;
		right_margin = <234>;
		upper_margin = <3>;
		lower_margin = <41>;
		hsync_len = <3>;
		vsync_len = <2>;
		pixclock = <33264000>;
		sync = <3>;
		timing = <0x88>;
		};
		};
		};
		};

arch/arm/boot/dts/atlas6.dtsi

0 → 100644

+668 −0

Original line number	Diff line number	Diff line
		/*
		* DTS file for CSR SiRFatlas6 SoC
		*
		* Copyright (c) 2012 Cambridge Silicon Radio Limited, a CSR plc group company.
		*
		* Licensed under GPLv2 or later.
		*/

		/include/ "skeleton.dtsi"
		/ {
		compatible = "sirf,atlas6";
		#address-cells = <1>;
		#size-cells = <1>;
		interrupt-parent = <&intc>;

		cpus {
		#address-cells = <1>;
		#size-cells = <0>;

		cpu@0 {
		reg = <0x0>;
		d-cache-line-size = <32>;
		i-cache-line-size = <32>;
		d-cache-size = <32768>;
		i-cache-size = <32768>;
		/* from bootloader */
		timebase-frequency = <0>;
		bus-frequency = <0>;
		clock-frequency = <0>;
		};
		};

		axi {
		compatible = "simple-bus";
		#address-cells = <1>;
		#size-cells = <1>;
		ranges = <0x40000000 0x40000000 0x80000000>;

		intc: interrupt-controller@80020000 {
		#interrupt-cells = <1>;
		interrupt-controller;
		compatible = "sirf,prima2-intc";
		reg = <0x80020000 0x1000>;
		};

		sys-iobg {
		compatible = "simple-bus";
		#address-cells = <1>;
		#size-cells = <1>;
		ranges = <0x88000000 0x88000000 0x40000>;

		clks: clock-controller@88000000 {
		compatible = "sirf,atlas6-clkc";
		reg = <0x88000000 0x1000>;
		interrupts = <3>;
		#clock-cells = <1>;
		};

		reset-controller@88010000 {
		compatible = "sirf,prima2-rstc";
		reg = <0x88010000 0x1000>;
		};

		rsc-controller@88020000 {
		compatible = "sirf,prima2-rsc";
		reg = <0x88020000 0x1000>;
		};
		};

		mem-iobg {
		compatible = "simple-bus";
		#address-cells = <1>;
		#size-cells = <1>;
		ranges = <0x90000000 0x90000000 0x10000>;

		memory-controller@90000000 {
		compatible = "sirf,prima2-memc";
		reg = <0x90000000 0x10000>;
		interrupts = <27>;
		clocks = <&clks 5>;
		};
		};

		disp-iobg {
		compatible = "simple-bus";
		#address-cells = <1>;
		#size-cells = <1>;
		ranges = <0x90010000 0x90010000 0x30000>;

		lcd@90010000 {
		compatible = "sirf,prima2-lcd";
		reg = <0x90010000 0x20000>;
		interrupts = <30>;
		clocks = <&clks 34>;
		display=<&display>;
		/* later transfer to pwm */
		bl-gpio = <&gpio 7 0>;
		default-panel = <&panel0>;
		};

		vpp@90020000 {
		compatible = "sirf,prima2-vpp";
		reg = <0x90020000 0x10000>;
		interrupts = <31>;
		clocks = <&clks 35>;
		};
		};

		graphics-iobg {
		compatible = "simple-bus";
		#address-cells = <1>;
		#size-cells = <1>;
		ranges = <0x98000000 0x98000000 0x8000000>;

		graphics@98000000 {
		compatible = "powervr,sgx510";
		reg = <0x98000000 0x8000000>;
		interrupts = <6>;
		clocks = <&clks 32>;
		};
		};

		dsp-iobg {
		compatible = "simple-bus";
		#address-cells = <1>;
		#size-cells = <1>;
		ranges = <0xa8000000 0xa8000000 0x2000000>;

		dspif@a8000000 {
		compatible = "sirf,prima2-dspif";
		reg = <0xa8000000 0x10000>;
		interrupts = <9>;
		};

		gps@a8010000 {
		compatible = "sirf,prima2-gps";
		reg = <0xa8010000 0x10000>;
		interrupts = <7>;
		clocks = <&clks 9>;
		};

		dsp@a9000000 {
		compatible = "sirf,prima2-dsp";
		reg = <0xa9000000 0x1000000>;
		interrupts = <8>;
		clocks = <&clks 8>;
		};
		};

		peri-iobg {
		compatible = "simple-bus";
		#address-cells = <1>;
		#size-cells = <1>;
		ranges = <0xb0000000 0xb0000000 0x180000>,
		<0x56000000 0x56000000 0x1b00000>;

		timer@b0020000 {
		compatible = "sirf,prima2-tick";
		reg = <0xb0020000 0x1000>;
		interrupts = <0>;
		};

		nand@b0030000 {
		compatible = "sirf,prima2-nand";
		reg = <0xb0030000 0x10000>;
		interrupts = <41>;
		clocks = <&clks 26>;
		};

		audio@b0040000 {
		compatible = "sirf,prima2-audio";
		reg = <0xb0040000 0x10000>;
		interrupts = <35>;
		clocks = <&clks 27>;
		};

		uart0: uart@b0050000 {
		cell-index = <0>;
		compatible = "sirf,prima2-uart";
		reg = <0xb0050000 0x1000>;
		interrupts = <17>;
		fifosize = <128>;
		clocks = <&clks 13>;
		};

		uart1: uart@b0060000 {
		cell-index = <1>;
		compatible = "sirf,prima2-uart";
		reg = <0xb0060000 0x1000>;
		interrupts = <18>;
		fifosize = <32>;
		clocks = <&clks 14>;
		};

		uart2: uart@b0070000 {
		cell-index = <2>;
		compatible = "sirf,prima2-uart";
		reg = <0xb0070000 0x1000>;
		interrupts = <19>;
		fifosize = <128>;
		clocks = <&clks 15>;
		};

		usp0: usp@b0080000 {
		cell-index = <0>;
		compatible = "sirf,prima2-usp";
		reg = <0xb0080000 0x10000>;
		interrupts = <20>;
		clocks = <&clks 28>;
		};

		usp1: usp@b0090000 {
		cell-index = <1>;
		compatible = "sirf,prima2-usp";
		reg = <0xb0090000 0x10000>;
		interrupts = <21>;
		clocks = <&clks 29>;
		};

		dmac0: dma-controller@b00b0000 {
		cell-index = <0>;
		compatible = "sirf,prima2-dmac";
		reg = <0xb00b0000 0x10000>;
		interrupts = <12>;
		clocks = <&clks 24>;
		};

		dmac1: dma-controller@b0160000 {
		cell-index = <1>;
		compatible = "sirf,prima2-dmac";
		reg = <0xb0160000 0x10000>;
		interrupts = <13>;
		clocks = <&clks 25>;
		};

		vip@b00C0000 {
		compatible = "sirf,prima2-vip";
		reg = <0xb00C0000 0x10000>;
		clocks = <&clks 31>;
		};

		spi0: spi@b00d0000 {
		cell-index = <0>;
		compatible = "sirf,prima2-spi";
		reg = <0xb00d0000 0x10000>;
		interrupts = <15>;
		sirf,spi-num-chipselects = <1>;
		cs-gpios = <&gpio 0 0>;
		sirf,spi-dma-rx-channel = <25>;
		sirf,spi-dma-tx-channel = <20>;
		#address-cells = <1>;
		#size-cells = <0>;
		clocks = <&clks 19>;
		status = "disabled";
		};

		spi1: spi@b0170000 {
		cell-index = <1>;
		compatible = "sirf,prima2-spi";
		reg = <0xb0170000 0x10000>;
		interrupts = <16>;
		clocks = <&clks 20>;
		status = "disabled";
		};

		i2c0: i2c@b00e0000 {
		cell-index = <0>;
		compatible = "sirf,prima2-i2c";
		reg = <0xb00e0000 0x10000>;
		interrupts = <24>;
		#address-cells = <1>;
		#size-cells = <0>;
		clocks = <&clks 17>;
		};

		i2c1: i2c@b00f0000 {
		cell-index = <1>;
		compatible = "sirf,prima2-i2c";
		reg = <0xb00f0000 0x10000>;
		interrupts = <25>;
		#address-cells = <1>;
		#size-cells = <0>;
		clocks = <&clks 18>;
		};

		tsc@b0110000 {
		compatible = "sirf,prima2-tsc";
		reg = <0xb0110000 0x10000>;
		interrupts = <33>;
		clocks = <&clks 16>;
		};

		gpio: pinctrl@b0120000 {
		#gpio-cells = <2>;
		#interrupt-cells = <2>;
		compatible = "sirf,atlas6-pinctrl";
		reg = <0xb0120000 0x10000>;
		interrupts = <43 44 45 46 47>;
		gpio-controller;
		interrupt-controller;

		lcd_16pins_a: lcd0@0 {
		lcd {
		sirf,pins = "lcd_16bitsgrp";
		sirf,function = "lcd_16bits";
		};
		};
		lcd_18pins_a: lcd0@1 {
		lcd {
		sirf,pins = "lcd_18bitsgrp";
		sirf,function = "lcd_18bits";
		};
		};
		lcd_24pins_a: lcd0@2 {
		lcd {
		sirf,pins = "lcd_24bitsgrp";
		sirf,function = "lcd_24bits";
		};
		};
		lcdrom_pins_a: lcdrom0@0 {
		lcd {
		sirf,pins = "lcdromgrp";
		sirf,function = "lcdrom";
		};
		};
		uart0_pins_a: uart0@0 {
		uart {
		sirf,pins = "uart0grp";
		sirf,function = "uart0";
		};
		};
		uart1_pins_a: uart1@0 {
		uart {
		sirf,pins = "uart1grp";
		sirf,function = "uart1";
		};
		};
		uart2_pins_a: uart2@0 {
		uart {
		sirf,pins = "uart2grp";
		sirf,function = "uart2";
		};
		};
		uart2_noflow_pins_a: uart2@1 {
		uart {
		sirf,pins = "uart2_nostreamctrlgrp";
		sirf,function = "uart2_nostreamctrl";
		};
		};
		spi0_pins_a: spi0@0 {
		spi {
		sirf,pins = "spi0grp";
		sirf,function = "spi0";
		};
		};
		spi1_pins_a: spi1@0 {
		spi {
		sirf,pins = "spi1grp";
		sirf,function = "spi1";
		};
		};
		i2c0_pins_a: i2c0@0 {
		i2c {
		sirf,pins = "i2c0grp";
		sirf,function = "i2c0";
		};
		};
		i2c1_pins_a: i2c1@0 {
		i2c {
		sirf,pins = "i2c1grp";
		sirf,function = "i2c1";
		};
		};
		pwm0_pins_a: pwm0@0 {
		pwm {
		sirf,pins = "pwm0grp";
		sirf,function = "pwm0";
		};
		};
		pwm1_pins_a: pwm1@0 {
		pwm {
		sirf,pins = "pwm1grp";
		sirf,function = "pwm1";
		};
		};
		pwm2_pins_a: pwm2@0 {
		pwm {
		sirf,pins = "pwm2grp";
		sirf,function = "pwm2";
		};
		};
		pwm3_pins_a: pwm3@0 {
		pwm {
		sirf,pins = "pwm3grp";
		sirf,function = "pwm3";
		};
		};
		pwm4_pins_a: pwm4@0 {
		pwm {
		sirf,pins = "pwm4grp";
		sirf,function = "pwm4";
		};
		};
		gps_pins_a: gps@0 {
		gps {
		sirf,pins = "gpsgrp";
		sirf,function = "gps";
		};
		};
		vip_pins_a: vip@0 {
		vip {
		sirf,pins = "vipgrp";
		sirf,function = "vip";
		};
		};
		sdmmc0_pins_a: sdmmc0@0 {
		sdmmc0 {
		sirf,pins = "sdmmc0grp";
		sirf,function = "sdmmc0";
		};
		};
		sdmmc1_pins_a: sdmmc1@0 {
		sdmmc1 {
		sirf,pins = "sdmmc1grp";
		sirf,function = "sdmmc1";
		};
		};
		sdmmc2_pins_a: sdmmc2@0 {
		sdmmc2 {
		sirf,pins = "sdmmc2grp";
		sirf,function = "sdmmc2";
		};
		};
		sdmmc2_nowp_pins_a: sdmmc2_nowp@0 {
		sdmmc2_nowp {
		sirf,pins = "sdmmc2_nowpgrp";
		sirf,function = "sdmmc2_nowp";
		};
		};
		sdmmc3_pins_a: sdmmc3@0 {
		sdmmc3 {
		sirf,pins = "sdmmc3grp";
		sirf,function = "sdmmc3";
		};
		};
		sdmmc5_pins_a: sdmmc5@0 {
		sdmmc5 {
		sirf,pins = "sdmmc5grp";
		sirf,function = "sdmmc5";
		};
		};
		i2s_pins_a: i2s@0 {
		i2s {
		sirf,pins = "i2sgrp";
		sirf,function = "i2s";
		};
		};
		i2s_no_din_pins_a: i2s_no_din@0 {
		i2s_no_din {
		sirf,pins = "i2s_no_dingrp";
		sirf,function = "i2s_no_din";
		};
		};
		i2s_6chn_pins_a: i2s_6chn@0 {
		i2s_6chn {
		sirf,pins = "i2s_6chngrp";
		sirf,function = "i2s_6chn";
		};
		};
		ac97_pins_a: ac97@0 {
		ac97 {
		sirf,pins = "ac97grp";
		sirf,function = "ac97";
		};
		};
		nand_pins_a: nand@0 {
		nand {
		sirf,pins = "nandgrp";
		sirf,function = "nand";
		};
		};
		usp0_pins_a: usp0@0 {
		usp0 {
		sirf,pins = "usp0grp";
		sirf,function = "usp0";
		};
		};
		usp1_pins_a: usp1@0 {
		usp1 {
		sirf,pins = "usp1grp";
		sirf,function = "usp1";
		};
		};
		usb0_upli_drvbus_pins_a: usb0_upli_drvbus@0 {
		usb0_upli_drvbus {
		sirf,pins = "usb0_upli_drvbusgrp";
		sirf,function = "usb0_upli_drvbus";
		};
		};
		usb1_utmi_drvbus_pins_a: usb1_utmi_drvbus@0 {
		usb1_utmi_drvbus {
		sirf,pins = "usb1_utmi_drvbusgrp";
		sirf,function = "usb1_utmi_drvbus";
		};
		};
		warm_rst_pins_a: warm_rst@0 {
		warm_rst {
		sirf,pins = "warm_rstgrp";
		sirf,function = "warm_rst";
		};
		};
		pulse_count_pins_a: pulse_count@0 {
		pulse_count {
		sirf,pins = "pulse_countgrp";
		sirf,function = "pulse_count";
		};
		};
		cko0_rst_pins_a: cko0_rst@0 {
		cko0_rst {
		sirf,pins = "cko0_rstgrp";
		sirf,function = "cko0_rst";
		};
		};
		cko1_rst_pins_a: cko1_rst@0 {
		cko1_rst {
		sirf,pins = "cko1_rstgrp";
		sirf,function = "cko1_rst";
		};
		};
		};

		pwm@b0130000 {
		compatible = "sirf,prima2-pwm";
		reg = <0xb0130000 0x10000>;
		clocks = <&clks 21>;
		};

		efusesys@b0140000 {
		compatible = "sirf,prima2-efuse";
		reg = <0xb0140000 0x10000>;
		clocks = <&clks 22>;
		};

		pulsec@b0150000 {
		compatible = "sirf,prima2-pulsec";
		reg = <0xb0150000 0x10000>;
		interrupts = <48>;
		clocks = <&clks 23>;
		};

		pci-iobg {
		compatible = "sirf,prima2-pciiobg", "simple-bus";
		#address-cells = <1>;
		#size-cells = <1>;
		ranges = <0x56000000 0x56000000 0x1b00000>;

		sd0: sdhci@56000000 {
		cell-index = <0>;
		compatible = "sirf,prima2-sdhc";
		reg = <0x56000000 0x100000>;
		interrupts = <38>;
		bus-width = <8>;
		clocks = <&clks 36>;
		};

		sd1: sdhci@56100000 {
		cell-index = <1>;
		compatible = "sirf,prima2-sdhc";
		reg = <0x56100000 0x100000>;
		interrupts = <38>;
		status = "disabled";
		clocks = <&clks 36>;
		};

		sd2: sdhci@56200000 {
		cell-index = <2>;
		compatible = "sirf,prima2-sdhc";
		reg = <0x56200000 0x100000>;
		interrupts = <23>;
		status = "disabled";
		clocks = <&clks 37>;
		};

		sd3: sdhci@56300000 {
		cell-index = <3>;
		compatible = "sirf,prima2-sdhc";
		reg = <0x56300000 0x100000>;
		interrupts = <23>;
		status = "disabled";
		clocks = <&clks 37>;
		};

		sd5: sdhci@56500000 {
		cell-index = <5>;
		compatible = "sirf,prima2-sdhc";
		reg = <0x56500000 0x100000>;
		interrupts = <39>;
		status = "disabled";
		clocks = <&clks 38>;
		};

		pci-copy@57900000 {
		compatible = "sirf,prima2-pcicp";
		reg = <0x57900000 0x100000>;
		interrupts = <40>;
		};

		rom-interface@57a00000 {
		compatible = "sirf,prima2-romif";
		reg = <0x57a00000 0x100000>;
		};
		};
		};

		rtc-iobg {
		compatible = "sirf,prima2-rtciobg", "sirf-prima2-rtciobg-bus";
		#address-cells = <1>;
		#size-cells = <1>;
		reg = <0x80030000 0x10000>;

		gpsrtc@1000 {
		compatible = "sirf,prima2-gpsrtc";
		reg = <0x1000 0x1000>;
		interrupts = <55 56 57>;
		};

		sysrtc@2000 {
		compatible = "sirf,prima2-sysrtc";
		reg = <0x2000 0x1000>;
		interrupts = <52 53 54>;
		};

		pwrc@3000 {
		compatible = "sirf,prima2-pwrc";
		reg = <0x3000 0x1000>;
		interrupts = <32>;
		};
		};

		uus-iobg {
		compatible = "simple-bus";
		#address-cells = <1>;
		#size-cells = <1>;
		ranges = <0xb8000000 0xb8000000 0x40000>;

		usb0: usb@b00e0000 {
		compatible = "chipidea,ci13611a-prima2";
		reg = <0xb8000000 0x10000>;
		interrupts = <10>;
		clocks = <&clks 40>;
		};

		usb1: usb@b00f0000 {
		compatible = "chipidea,ci13611a-prima2";
		reg = <0xb8010000 0x10000>;
		interrupts = <11>;
		clocks = <&clks 41>;
		};

		security@b00f0000 {
		compatible = "sirf,prima2-security";
		reg = <0xb8030000 0x10000>;
		interrupts = <42>;
		clocks = <&clks 7>;
		};
		};
		};
		};

arch/arm/configs/multi_v7_defconfig

+6 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@ CONFIG_NO_HZ=y
		CONFIG_HIGH_RES_TIMERS=y
		CONFIG_ARCH_MVEBU=y
		CONFIG_MACH_ARMADA_370=y
		CONFIG_ARCH_SIRF=y
		CONFIG_MACH_ARMADA_XP=y
		CONFIG_ARCH_HIGHBANK=y
		CONFIG_ARCH_SOCFPGA=y
		@@ -40,12 +41,16 @@ CONFIG_KEYBOARD_SPEAR=y
		CONFIG_SERIAL_AMBA_PL011=y
		CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
		CONFIG_SERIAL_OF_PLATFORM=y
		CONFIG_SERIAL_SIRFSOC=y
		CONFIG_SERIAL_SIRFSOC_CONSOLE=y
		CONFIG_IPMI_HANDLER=y
		CONFIG_IPMI_SI=y
		CONFIG_I2C=y
		CONFIG_I2C_DESIGNWARE_PLATFORM=y
		CONFIG_I2C_SIRF=y
		CONFIG_SPI=y
		CONFIG_SPI_PL022=y
		CONFIG_SPI_SIRF=y
		CONFIG_GPIO_PL061=y
		CONFIG_FB=y
		CONFIG_FB_ARMCLCD=y
		@@ -66,4 +71,5 @@ CONFIG_RTC_CLASS=y
		CONFIG_RTC_DRV_PL031=y
		CONFIG_DMADEVICES=y
		CONFIG_PL330_DMA=y
		CONFIG_SIRF_DMA=y
		CONFIG_DW_DMAC=y

Admin message