Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/vitb/linux-2.6-PQ (5a3e3b22) · Commits · 戴 / test

arch/powerpc/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -594,6 +594,7 @@ endmenu

		source arch/powerpc/platforms/embedded6xx/Kconfig
		source arch/powerpc/platforms/4xx/Kconfig
		source arch/powerpc/platforms/82xx/Kconfig
		source arch/powerpc/platforms/83xx/Kconfig
		source arch/powerpc/platforms/85xx/Kconfig
		source arch/powerpc/platforms/86xx/Kconfig

arch/powerpc/boot/dts/mpc8272ads.dts

0 → 100644

+223 −0

Original line number	Diff line number	Diff line
		/*
		* MPC8272 ADS Device Tree Source
		*
		* Copyright 2005 Freescale Semiconductor Inc.
		*
		* This program is free software; you can redistribute it and/or modify it
		* under the terms of the GNU General Public License as published by the
		* Free Software Foundation; either version 2 of the License, or (at your
		* option) any later version.
		*/

		/ {
		model = "MPC8272ADS";
		compatible = "MPC8260ADS";
		#address-cells = <1>;
		#size-cells = <1>;
		linux,phandle = <100>;

		cpus {
		#cpus = <1>;
		#address-cells = <1>;
		#size-cells = <0>;
		linux,phandle = <200>;

		PowerPC,8272@0 {
		device_type = "cpu";
		reg = <0>;
		d-cache-line-size = <20>; // 32 bytes
		i-cache-line-size = <20>; // 32 bytes
		d-cache-size = <4000>; // L1, 16K
		i-cache-size = <4000>; // L1, 16K
		timebase-frequency = <0>;
		bus-frequency = <0>;
		clock-frequency = <0>;
		32-bit;
		linux,phandle = <201>;
		linux,boot-cpu;
		};
		};

		interrupt-controller@f8200000 {
		linux,phandle = <f8200000>;
		#address-cells = <0>;
		#interrupt-cells = <2>;
		interrupt-controller;
		reg = <f8200000 f8200004>;
		built-in;
		device_type = "pci-pic";
		};
		memory {
		device_type = "memory";
		linux,phandle = <300>;
		reg = <00000000 4000000 f4500000 00000020>;
		};

		soc8272@f0000000 {
		#address-cells = <1>;
		#size-cells = <1>;
		#interrupt-cells = <2>;
		device_type = "soc";
		ranges = < 0 0 2 00000000 f0000000 00053000>;
		reg = <f0000000 0>;

		mdio@0 {
		device_type = "mdio";
		compatible = "fs_enet";
		reg = <0 0>;
		linux,phandle = <24520>;
		#address-cells = <1>;
		#size-cells = <0>;
		ethernet-phy@0 {
		linux,phandle = <2452000>;
		interrupt-parent = <10c00>;
		interrupts = <19 1>;
		reg = <0>;
		bitbang = [ 12 12 13 02 02 01 ];
		device_type = "ethernet-phy";
		};
		ethernet-phy@1 {
		linux,phandle = <2452001>;
		interrupt-parent = <10c00>;
		interrupts = <19 1>;
		bitbang = [ 12 12 13 02 02 01 ];
		reg = <3>;
		device_type = "ethernet-phy";
		};
		};

		ethernet@24000 {
		#address-cells = <1>;
		#size-cells = <0>;
		device_type = "network";
		device-id = <2>;
		compatible = "fs_enet";
		model = "FCC";
		reg = <11300 20 8400 100 11380 30>;
		mac-address = [ 00 11 2F 99 43 54 ];
		interrupts = <20 2>;
		interrupt-parent = <10c00>;
		phy-handle = <2452000>;
		rx-clock = <13>;
		tx-clock = <12>;
		};

		ethernet@25000 {
		device_type = "network";
		device-id = <3>;
		compatible = "fs_enet";
		model = "FCC";
		reg = <11320 20 8500 100 113b0 30>;
		mac-address = [ 00 11 2F 99 44 54 ];
		interrupts = <21 2>;
		interrupt-parent = <10c00>;
		phy-handle = <2452001>;
		rx-clock = <17>;
		tx-clock = <18>;
		};

		cpm@f0000000 {
		linux,phandle = <f0000000>;
		#address-cells = <1>;
		#size-cells = <1>;
		#interrupt-cells = <2>;
		device_type = "cpm";
		model = "CPM2";
		ranges = <00000000 00000000 3ffff>;
		reg = <10d80 3280>;
		command-proc = <119c0>;
		brg-frequency = <17D7840>;
		cpm_clk = <BEBC200>;

		scc@11a00 {
		device_type = "serial";
		compatible = "cpm_uart";
		model = "SCC";
		device-id = <2>;
		reg = <11a00 20 8000 100>;
		current-speed = <1c200>;
		interrupts = <28 2>;
		interrupt-parent = <10c00>;
		clock-setup = <0 00ffffff>;
		rx-clock = <1>;
		tx-clock = <1>;
		};

		scc@11a60 {
		device_type = "serial";
		compatible = "cpm_uart";
		model = "SCC";
		device-id = <5>;
		reg = <11a60 20 8300 100>;
		current-speed = <1c200>;
		interrupts = <2b 2>;
		interrupt-parent = <10c00>;
		clock-setup = <1b ffffff00>;
		rx-clock = <4>;
		tx-clock = <4>;
		};

		};
		interrupt-controller@10c00 {
		linux,phandle = <10c00>;
		#address-cells = <0>;
		#interrupt-cells = <2>;
		interrupt-controller;
		reg = <10c00 80>;
		built-in;
		device_type = "cpm-pic";
		compatible = "CPM2";
		};
		pci@0500 {
		linux,phandle = <0500>;
		#interrupt-cells = <1>;
		#size-cells = <2>;
		#address-cells = <3>;
		compatible = "8272";
		device_type = "pci";
		reg = <10430 4dc>;
		clock-frequency = <3f940aa>;
		interrupt-map-mask = <f800 0 0 7>;
		interrupt-map = <

		/* IDSEL 0x16 */
		b000 0 0 1 f8200000 40 0
		b000 0 0 2 f8200000 41 0
		b000 0 0 3 f8200000 42 0
		b000 0 0 4 f8200000 43 0

		/* IDSEL 0x17 */
		b800 0 0 1 f8200000 43 0
		b800 0 0 2 f8200000 40 0
		b800 0 0 3 f8200000 41 0
		b800 0 0 4 f8200000 42 0

		/* IDSEL 0x18 */
		c000 0 0 1 f8200000 42 0
		c000 0 0 2 f8200000 43 0
		c000 0 0 3 f8200000 40 0
		c000 0 0 4 f8200000 41 0>;
		interrupt-parent = <10c00>;
		interrupts = <14 3>;
		bus-range = <0 0>;
		ranges = <02000000 0 80000000 80000000 0 40000000
		01000000 0 00000000 f6000000 0 02000000>;
		};

		/* May need to remove if on a part without crypto engine */
		crypto@30000 {
		device_type = "crypto";
		model = "SEC2";
		compatible = "talitos";
		reg = <30000 10000>;
		interrupts = <b 0>;
		interrupt-parent = <10c00>;
		num-channels = <4>;
		channel-fifo-len = <18>;
		exec-units-mask = <0000007e>;
		/* desc mask is for rev1.x, we need runtime fixup for >=2.x */
		descriptor-types-mask = <01010ebf>;
		};

		};
		};

arch/powerpc/platforms/82xx/Kconfig

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		menu "Platform support"
		depends on PPC_82xx

		choice
		prompt "Machine Type"
		default MPC82xx_ADS

		config MPC82xx_ADS
		bool "Freescale MPC82xx ADS"
		select DEFAULT_UIMAGE
		select PQ2ADS
		select 8272
		select 8260
		select CPM2
		select FSL_SOC
		help
		This option enables support for the MPC8272 ADS board

		endchoice

		endmenu

arch/powerpc/platforms/82xx/Makefile

0 → 100644

+5 −0

Original line number	Diff line number	Diff line
		#
		# Makefile for the PowerPC 82xx linux kernel.
		#
		obj-$(CONFIG_PPC_82xx) += mpc82xx.o
		obj-$(CONFIG_MPC82xx_ADS) += mpc82xx_ads.o

arch/powerpc/platforms/82xx/m82xx_pci.h

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		#ifndef _PPC_KERNEL_M82XX_PCI_H
		#define _PPC_KERNEL_M82XX_PCI_H

		/*
		* This program is free software; you can redistribute it and/or
		* modify it under the terms of the GNU General Public License
		* as published by the Free Software Foundation; either version
		* 2 of the License, or (at your option) any later version.
		*/

		#include <asm/m8260_pci.h>

		#define SIU_INT_IRQ1 ((uint)0x13 + CPM_IRQ_OFFSET)

		#ifndef _IO_BASE
		#define _IO_BASE isa_io_base
		#endif

		#endif /* _PPC_KERNEL_M8260_PCI_H */

Admin message