Просмотр исходного кода

bcm53xx: reorder some arch patches

This moves arch patches affecting many DTS files. Thanks to this change
we can put some ready-to-mainline patches at 300-319 and simplify
backporting process.

Signed-off-by: Rafał Miłecki <[email protected]>

SVN-Revision: 46889
Rafał Miłecki 10 лет назад
Родитель
Сommit
450aebcdce

+ 2 - 2
target/linux/bcm53xx/patches-3.18/320-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch

@@ -15,8 +15,8 @@ Signed-off-by: Rafał Miłecki <[email protected]>
 
 --- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
 +++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
-@@ -25,6 +25,23 @@
- 		       0x88000000 0x18000000>;
+@@ -24,6 +24,23 @@
+ 		reg = <0x00000000 0x08000000>;
  	};
  
 +	clocks {

+ 4 - 4
target/linux/bcm53xx/patches-3.18/321-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers.patch

@@ -14,8 +14,8 @@ Signed-off-by: Rafał Miłecki <[email protected]>
 
 --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
 +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
-@@ -25,6 +25,26 @@
- 		       0x88000000 0x18000000>;
+@@ -24,6 +24,26 @@
+ 		reg = <0x00000000 0x08000000>;
  	};
  
 +	axi@18000000 {
@@ -43,8 +43,8 @@ Signed-off-by: Rafał Miłecki <[email protected]>
  		num-chipselects = <1>;
 --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
 +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
-@@ -25,6 +25,17 @@
- 		       0x88000000 0x08000000>;
+@@ -24,6 +24,17 @@
+ 		reg = <0x00000000 0x08000000>;
  	};
  
 +	axi@18000000 {

+ 0 - 0
target/linux/bcm53xx/patches-3.18/303-ARM-BCM5310X-Enable-earlyprintk-on-tested-devices.patch → target/linux/bcm53xx/patches-3.18/330-ARM-BCM5310X-Enable-earlyprintk-on-tested-devices.patch


+ 3 - 3
target/linux/bcm53xx/patches-3.18/306-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch → target/linux/bcm53xx/patches-3.18/331-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch

@@ -26,7 +26,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>
 +		       0x88000000 0x18000000>;
  	};
  
- 	spi {
+ 	axi@18000000 {
 --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
 +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
 @@ -21,7 +21,8 @@
@@ -38,7 +38,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>
 +		       0x88000000 0x08000000>;
  	};
  
- 	leds {
+ 	axi@18000000 {
 --- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
 +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
 @@ -21,7 +21,8 @@
@@ -134,7 +134,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>
 +		       0x88000000 0x18000000>;
  	};
  
- 	leds {
+ 	clocks {
 --- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
 +++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
 @@ -21,7 +21,8 @@

+ 2 - 2
target/linux/bcm53xx/patches-4.1/320-ARM-BCM5301X-Add-Buffalo-WXR-1900DHP-clock-and-USB-p.patch

@@ -15,8 +15,8 @@ Signed-off-by: Rafał Miłecki <[email protected]>
 
 --- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
 +++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
-@@ -25,6 +25,23 @@
- 		       0x88000000 0x18000000>;
+@@ -24,6 +24,23 @@
+ 		reg = <0x00000000 0x08000000>;
  	};
  
 +	clocks {

+ 4 - 4
target/linux/bcm53xx/patches-4.1/321-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers.patch

@@ -14,8 +14,8 @@ Signed-off-by: Rafał Miłecki <[email protected]>
 
 --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
 +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
-@@ -25,6 +25,26 @@
- 		       0x88000000 0x18000000>;
+@@ -24,6 +24,26 @@
+ 		reg = <0x00000000 0x08000000>;
  	};
  
 +	axi@18000000 {
@@ -43,8 +43,8 @@ Signed-off-by: Rafał Miłecki <[email protected]>
  		num-chipselects = <1>;
 --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
 +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
-@@ -25,6 +25,17 @@
- 		       0x88000000 0x08000000>;
+@@ -24,6 +24,17 @@
+ 		reg = <0x00000000 0x08000000>;
  	};
  
 +	axi@18000000 {

+ 0 - 0
target/linux/bcm53xx/patches-4.1/303-ARM-BCM5310X-Enable-earlyprintk-on-tested-devices.patch → target/linux/bcm53xx/patches-4.1/330-ARM-BCM5310X-Enable-earlyprintk-on-tested-devices.patch


+ 3 - 3
target/linux/bcm53xx/patches-4.1/306-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch → target/linux/bcm53xx/patches-4.1/331-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch

@@ -26,7 +26,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>
 +		       0x88000000 0x18000000>;
  	};
  
- 	spi {
+ 	axi@18000000 {
 --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
 +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
 @@ -21,7 +21,8 @@
@@ -38,7 +38,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>
 +		       0x88000000 0x08000000>;
  	};
  
- 	leds {
+ 	axi@18000000 {
 --- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
 +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
 @@ -21,7 +21,8 @@
@@ -134,7 +134,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>
 +		       0x88000000 0x18000000>;
  	};
  
- 	leds {
+ 	clocks {
 --- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
 +++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
 @@ -21,7 +21,8 @@