Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff4be78b authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'next' of ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx

parents a501d8f3 423da269

arch/powerpc/boot/dts/glacier.dts

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
	#address-cells = <2>;

	#size-cells = <1>;

	model = "amcc,glacier";

	compatible = "amcc,glacier", "amcc,canyonlands";

	compatible = "amcc,glacier";

	dcr-parent = <&{/cpus/cpu@0}>;



	aliases {

arch/powerpc/boot/dts/sequoia.dts

+9 −0
Original line number Diff line number Diff line
@@ -246,13 +246,22 @@ 
	   		};



			IIC0: i2c@ef600700 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "ibm,iic-440epx", "ibm,iic";

				reg = <0xef600700 0x00000014>;

				interrupt-parent = <&UIC0>;

				interrupts = <0x2 0x4>;



				hwmon@48 {

					compatible = "adi,ad7414";

					reg = <0x48>;

				};

			};



			IIC1: i2c@ef600800 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "ibm,iic-440epx", "ibm,iic";

				reg = <0xef600800 0x00000014>;

				interrupt-parent = <&UIC0>;

arch/powerpc/boot/dts/yosemite.dts

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
	#address-cells = <2>;

	#size-cells = <1>;

	model = "amcc,yosemite";

	compatible = "amcc,yosemite","amcc,bamboo";

	compatible = "amcc,yosemite";

	dcr-parent = <&{/cpus/cpu@0}>;



	aliases {

arch/powerpc/platforms/44x/Kconfig

+25 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ config BAMBOO 
	bool "Bamboo"

	depends on 44x

	default n

	select PPC44x_SIMPLE

	select 440EP

	select PCI

	help
@@ -30,6 +31,7 @@ config SEQUOIA 
	bool "Sequoia"

	depends on 44x

	default n

	select PPC44x_SIMPLE

	select 440EPX

	help

	  This option enables support for the AMCC PPC440EPX evaluation board.
@@ -38,6 +40,7 @@ config TAISHAN 
	bool "Taishan"

	depends on 44x

	default n

	select PPC44x_SIMPLE

	select 440GX

	select PCI

	help
@@ -48,6 +51,7 @@ config KATMAI 
	bool "Katmai"

	depends on 44x

	default n

	select PPC44x_SIMPLE

	select 440SPe

	select PCI

	select PPC4xx_PCI_EXPRESS
@@ -58,6 +62,7 @@ config RAINIER 
	bool "Rainier"

	depends on 44x

	default n

	select PPC44x_SIMPLE

	select 440GRX

	select PCI

	help
@@ -80,16 +85,29 @@ config CANYONLANDS 
	bool "Canyonlands"

	depends on 44x

	default n

	select PPC44x_SIMPLE

	select 460EX

	select PCI

	select PPC4xx_PCI_EXPRESS

	help

	  This option enables support for the AMCC PPC460EX evaluation board.



config GLACIER

	bool "Glacier"

	depends on 44x

	default n

	select PPC44x_SIMPLE

	select 460EX # Odd since it uses 460GT but the effects are the same

	select PCI

	select PPC4xx_PCI_EXPRESS

	help

	  This option enables support for the AMCC PPC460GT evaluation board.



config YOSEMITE

	bool "Yosemite"

	depends on 44x

	default n

	select PPC44x_SIMPLE

	select 440EP

	select PCI

	help
@@ -127,6 +145,13 @@ config XILINX_VIRTEX440_GENERIC_BOARD 
	  Most Virtex 5 designs should use this unless it needs to do some

	  special configuration at board probe time.



config PPC44x_SIMPLE

	bool "Simple PowerPC 44x board support"

	depends on 44x

	default n

	help

	  This option enables the simple PowerPC 44x platform support.



# 44x specific CPU modules, selected based on the board above.

config 440EP

	bool

arch/powerpc/platforms/44x/Makefile

+1 −7
Original line number Diff line number Diff line 
obj-$(CONFIG_44x)	:= misc_44x.o idle.o

obj-$(CONFIG_PPC44x_SIMPLE) += ppc44x_simple.o

obj-$(CONFIG_EBONY)	+= ebony.o

obj-$(CONFIG_TAISHAN)	+= taishan.o

obj-$(CONFIG_BAMBOO)	+= bamboo.o

obj-$(CONFIG_YOSEMITE)	+= bamboo.o

obj-$(CONFIG_SAM440EP) 	+= sam440ep.o

obj-$(CONFIG_SEQUOIA)	+= sequoia.o

obj-$(CONFIG_KATMAI)	+= katmai.o

obj-$(CONFIG_RAINIER)	+= rainier.o

obj-$(CONFIG_WARP)	+= warp.o

obj-$(CONFIG_WARP)	+= warp-nand.o

obj-$(CONFIG_CANYONLANDS) += canyonlands.o

obj-$(CONFIG_XILINX_VIRTEX_5_FXT) += virtex.o